diff options
author | Michael Jurka <mikejurka@google.com> | 2011-10-04 15:13:44 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-04 15:13:44 -0700 |
commit | 9b09219df6601a877425c6dfad4a8de8a1ea2f44 (patch) | |
tree | 3a5651f2f6808601cd23b1a7cf645467ca1b04a1 /src/com/android | |
parent | 92feab2236ab34bec52fcc6721194df338fa9edd (diff) | |
parent | e6235dd225404239b55c459245543f3302326112 (diff) | |
download | android_packages_apps_Trebuchet-9b09219df6601a877425c6dfad4a8de8a1ea2f44.tar.gz android_packages_apps_Trebuchet-9b09219df6601a877425c6dfad4a8de8a1ea2f44.tar.bz2 android_packages_apps_Trebuchet-9b09219df6601a877425c6dfad4a8de8a1ea2f44.zip |
Merge "Removing click delay from hotseat"
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher2/BubbleTextView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/CellLayout.java | 5 | ||||
-rw-r--r-- | src/com/android/launcher2/CellLayoutChildren.java | 5 |
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) { |