commit 36a62fe917be0a2520c457f985075fb5d3d09d1c
author Winson Chung <winsonc@google.com> Sun May 06 18:04:42 2012 -0700
committer Winson Chung <winsonc@google.com> Sun May 06 19:06:30 2012 -0700
tree 1dc0c024d1648b99eaa1371f0c2dc9abc6b0ad08
parent 04cb48f465e7a9382efa9438ef9826ba5bcb416d

Further preventing drags while loading is in progress. (Bug 6276881)

Change-Id: I3fc9ad4cd3d71a8eba4e3bcc0a1b6346c59fbee5

src/com/android/launcher2/PagedViewWithDraggableItems.java

diff --git a/src/com/android/launcher2/PagedViewWithDraggableItems.java b/src/com/android/launcher2/PagedViewWithDraggableItems.java
index a047970..22fd82b 100644
--- a/src/com/android/launcher2/PagedViewWithDraggableItems.java
+++ b/src/com/android/launcher2/PagedViewWithDraggableItems.java
@@ -107,6 +107,8 @@
         // When we have exited all apps or are in transition, disregard long clicks
         if (!mLauncher.isAllAppsCustomizeOpen() ||
                 mLauncher.getWorkspace().isSwitchingState()) return false;
+        // Return if global dragging is not enabled
+        if (!mLauncher.isDraggingEnabled()) return false;
 
         return beginDragging(v);
     }