Preventing delayed processing of old touch target in Customization drawer.
Change-Id: I982d953814e13ce195eee1aaa6739e895e328b2a
diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index a7293c8..92140b1 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -302,6 +302,8 @@
// 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 @@
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);