summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/PagedViewWithDraggableItems.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-05-06 18:04:42 -0700
committerWinson Chung <winsonc@google.com>2012-05-06 19:06:30 -0700
commit36a62fe917be0a2520c457f985075fb5d3d09d1c (patch)
tree1dc0c024d1648b99eaa1371f0c2dc9abc6b0ad08 /src/com/android/launcher2/PagedViewWithDraggableItems.java
parent04cb48f465e7a9382efa9438ef9826ba5bcb416d (diff)
downloadandroid_packages_apps_Trebuchet-36a62fe917be0a2520c457f985075fb5d3d09d1c.tar.gz
android_packages_apps_Trebuchet-36a62fe917be0a2520c457f985075fb5d3d09d1c.tar.bz2
android_packages_apps_Trebuchet-36a62fe917be0a2520c457f985075fb5d3d09d1c.zip
Further preventing drags while loading is in progress. (Bug 6276881)
Change-Id: I3fc9ad4cd3d71a8eba4e3bcc0a1b6346c59fbee5
Diffstat (limited to 'src/com/android/launcher2/PagedViewWithDraggableItems.java')
-rw-r--r--src/com/android/launcher2/PagedViewWithDraggableItems.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher2/PagedViewWithDraggableItems.java b/src/com/android/launcher2/PagedViewWithDraggableItems.java
index a0479707e..22fd82b69 100644
--- a/src/com/android/launcher2/PagedViewWithDraggableItems.java
+++ b/src/com/android/launcher2/PagedViewWithDraggableItems.java
@@ -107,6 +107,8 @@ public abstract class PagedViewWithDraggableItems extends PagedView
// 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);
}