summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2010-11-18 10:38:13 -0800
committerWinson Chung <winsonc@google.com>2010-11-18 10:38:45 -0800
commit649a4ca7dba2fd8e508b2a35f8327c612741adc8 (patch)
tree535879028272740ecb8381acab99475547cc5380 /src
parentff8d83044ccc377e9cb7952ac8a5a16c8af33fae (diff)
downloadandroid_packages_apps_Trebuchet-649a4ca7dba2fd8e508b2a35f8327c612741adc8.tar.gz
android_packages_apps_Trebuchet-649a4ca7dba2fd8e508b2a35f8327c612741adc8.tar.bz2
android_packages_apps_Trebuchet-649a4ca7dba2fd8e508b2a35f8327c612741adc8.zip
Preventing delayed processing of old touch target in Customization drawer.
Change-Id: I982d953814e13ce195eee1aaa6739e895e328b2a
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/CustomizePagedView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index a7293c88b..92140b1d9 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -302,6 +302,8 @@ public class CustomizePagedView extends PagedView
// End the current choice mode so that we don't carry selections across tabs
endChoiceMode();
+ // Reset the touch item (if we are mid-dragging)
+ mLastTouchedItem = null;
}
@Override
@@ -417,7 +419,7 @@ public class CustomizePagedView extends PagedView
boolean yMoved = yDiff > touchSlop;
boolean isUpwardMotion = (yDiff / (float) xDiff) > mDragSlopeThreshold;
- if (isUpwardMotion && yMoved) {
+ if (isUpwardMotion && yMoved && mLastTouchedItem != null) {
// Drag if the user moved far enough along the Y axis
beginDragging(mLastTouchedItem);