From 36a62fe917be0a2520c457f985075fb5d3d09d1c Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sun, 6 May 2012 18:04:42 -0700
Subject: Further preventing drags while loading is in progress. (Bug 6276881)

Change-Id: I3fc9ad4cd3d71a8eba4e3bcc0a1b6346c59fbee5
---
 src/com/android/launcher2/PagedViewWithDraggableItems.java | 2 ++
 1 file changed, 2 insertions(+)

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

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);
     }
-- 
cgit v1.2.3