diff options
| author | Winson Chung <winsonc@google.com> | 2011-09-16 20:14:36 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-09-18 18:38:11 -0700 |
| commit | 7d7541e7b48fdc114c24b3b0aa75e70d7228041e (patch) | |
| tree | 4b210341894a5e14d00d91009ac0b3874b76ac15 /src/com/android/launcher2/DragLayer.java | |
| parent | 23409c2a1247a7531348ab1c114eca959d78b37f (diff) | |
| download | android_packages_apps_Trebuchet-7d7541e7b48fdc114c24b3b0aa75e70d7228041e.tar.gz android_packages_apps_Trebuchet-7d7541e7b48fdc114c24b3b0aa75e70d7228041e.tar.bz2 android_packages_apps_Trebuchet-7d7541e7b48fdc114c24b3b0aa75e70d7228041e.zip | |
Updating Clings. (5057945, 5056643)
Change-Id: Ifb2d37e92495aeddf9d4b3277eb8d2a846f4aa99
Diffstat (limited to 'src/com/android/launcher2/DragLayer.java')
| -rw-r--r-- | src/com/android/launcher2/DragLayer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java index d0d4bad6e..28ef6a59f 100644 --- a/src/com/android/launcher2/DragLayer.java +++ b/src/com/android/launcher2/DragLayer.java @@ -108,7 +108,7 @@ public class DragLayer extends FrameLayout { } Folder currentFolder = mLauncher.getWorkspace().getOpenFolder(); - if (currentFolder != null && intercept) { + if (currentFolder != null && !mLauncher.isFolderClingVisible() && intercept) { if (currentFolder.isEditingName()) { getDescendantRectRelativeToSelf(currentFolder.getEditTextRegion(), hitRect); if (!hitRect.contains(x, y)) { |