From 304dcde0e301c2f1a0b2bdc80ea8617930691b6e Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 7 Jan 2011 11:17:23 -0800
Subject: Ensuring that we don't start dragging while another drag is in
 progress.

Change-Id: If3c5a059407efc3ee9a0c9b1b3b7fb942d3a7664
---
 src/com/android/launcher2/CustomizePagedView.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/com/android/launcher2/CustomizePagedView.java')

diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java
index 0b874bc11..6a563f28b 100644
--- a/src/com/android/launcher2/CustomizePagedView.java
+++ b/src/com/android/launcher2/CustomizePagedView.java
@@ -492,12 +492,13 @@ public class CustomizePagedView extends PagedViewWithDraggableItems
     }
 
     protected boolean beginDragging(View v) {
+        if (!v.isInTouchMode()) return false;
+        if (!super.beginDragging(v)) return false;
+
         // End the current choice mode before we start dragging anything
         if (isChoiceMode(CHOICE_MODE_SINGLE)) {
             endChoiceMode();
         }
-        super.beginDragging(v);
-
         boolean result = false;
         switch (mCustomizationType) {
         case WidgetCustomization: {
-- 
cgit v1.2.3