Merge "Removing click delay from hotseat"

3 files changed, 11 insertions, 1 deletions

diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java
index cdc89ba61..51fdc2eb6 100644
--- a/src/com/android/launcher2/BubbleTextView.java
+++ b/src/com/android/launcher2/BubbleTextView.java
@@ -221,7 +221,7 @@ public class BubbleTextView extends TextView {
                 // have to call invalidate as soon as the state is "pressed"
                 if (isPressed()) {
                     mDidInvalidateForPressedState = true;
-                    invalidate();
+                    setCellLayoutPressedOrFocusedIcon();
                 } else {
                     mDidInvalidateForPressedState = false;
                 }
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index c2e48e886..ad87fa603 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -639,6 +639,11 @@ public class CellLayout extends ViewGroup {
     }
 
     @Override
+    public boolean shouldDelayChildPressedState() {
+        return false;
+    }
+
+    @Override
     public void cancelLongPress() {
         super.cancelLongPress();
 
diff --git a/src/com/android/launcher2/CellLayoutChildren.java b/src/com/android/launcher2/CellLayoutChildren.java
index ac8c2ca16..35f5af104 100644
--- a/src/com/android/launcher2/CellLayoutChildren.java
+++ b/src/com/android/launcher2/CellLayoutChildren.java
@@ -122,6 +122,11 @@ public class CellLayoutChildren extends ViewGroup {
     }
 
     @Override
+    public boolean shouldDelayChildPressedState() {
+        return false;
+    }
+
+    @Override
     public void requestChildFocus(View child, View focused) {
         super.requestChildFocus(child, focused);
         if (child != null) {