diff options
| author | Winson Chung <winsonc@google.com> | 2012-05-06 18:04:42 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2012-05-06 19:06:30 -0700 |
| commit | 36a62fe917be0a2520c457f985075fb5d3d09d1c (patch) | |
| tree | 1dc0c024d1648b99eaa1371f0c2dc9abc6b0ad08 /src/com/android/launcher2/Folder.java | |
| parent | 04cb48f465e7a9382efa9438ef9826ba5bcb416d (diff) | |
| download | Launcher2-36a62fe917be0a2520c457f985075fb5d3d09d1c.tar.gz | |
Further preventing drags while loading is in progress. (Bug 6276881)
Change-Id: I3fc9ad4cd3d71a8eba4e3bcc0a1b6346c59fbee5
Diffstat (limited to 'src/com/android/launcher2/Folder.java')
| -rw-r--r-- | src/com/android/launcher2/Folder.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index 0389264a..f63e9bc3 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -200,6 +200,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } public boolean onLongClick(View v) { + // Return if global dragging is not enabled + if (!mLauncher.isDraggingEnabled()) return true; + Object tag = v.getTag(); if (tag instanceof ShortcutInfo) { ShortcutInfo item = (ShortcutInfo) tag; |