From 649a4ca7dba2fd8e508b2a35f8327c612741adc8 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 18 Nov 2010 10:38:13 -0800
Subject: [PATCH] Preventing delayed processing of old touch target in
 Customization drawer.

Change-Id: I982d953814e13ce195eee1aaa6739e895e328b2a
---
 src/com/android/launcher2/CustomizePagedView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index a7293c88b4..92140b1d97 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);