commit 9b09219df6601a877425c6dfad4a8de8a1ea2f44
author Michael Jurka <mikejurka@google.com> Tue Oct 04 15:13:44 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 04 15:13:44 2011 -0700
tree 3a5651f2f6808601cd23b1a7cf645467ca1b04a1
parent 92feab2236ab34bec52fcc6721194df338fa9edd
parent e6235dd225404239b55c459245543f3302326112

Merge "Removing click delay from hotseat"

src/com/android/launcher2/BubbleTextView.java

diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java
index cdc89ba..51fdc2e 100644
--- a/src/com/android/launcher2/BubbleTextView.java
+++ b/src/com/android/launcher2/BubbleTextView.java
@@ -221,7 +221,7 @@
                 // have to call invalidate as soon as the state is "pressed"
                 if (isPressed()) {
                     mDidInvalidateForPressedState = true;
-                    invalidate();
+                    setCellLayoutPressedOrFocusedIcon();
                 } else {
                     mDidInvalidateForPressedState = false;
                 }

src/com/android/launcher2/CellLayout.java

diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index c2e48e8..ad87fa6 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -639,6 +639,11 @@
     }
 
     @Override
+    public boolean shouldDelayChildPressedState() {
+        return false;
+    }
+
+    @Override
     public void cancelLongPress() {
         super.cancelLongPress();
 

src/com/android/launcher2/CellLayoutChildren.java

diff --git a/src/com/android/launcher2/CellLayoutChildren.java b/src/com/android/launcher2/CellLayoutChildren.java
index ac8c2ca..35f5af1 100644
--- a/src/com/android/launcher2/CellLayoutChildren.java
+++ b/src/com/android/launcher2/CellLayoutChildren.java
@@ -122,6 +122,11 @@
     }
 
     @Override
+    public boolean shouldDelayChildPressedState() {
+        return false;
+    }
+
+    @Override
     public void requestChildFocus(View child, View focused) {
         super.requestChildFocus(child, focused);
         if (child != null) {