diff options
author | Adam Cohen <adamcohen@google.com> | 2013-12-13 17:18:10 -0800 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-12-13 17:18:25 -0800 |
commit | 9c58d8269b3bdfdbe500b52ccce878ff2edb196b (patch) | |
tree | 3840511ef8e02b2c98bc8039a9d3c92ab6069641 | |
parent | 674531f26196502db825838b21b9cbf34463088c (diff) | |
download | android_packages_apps_Trebuchet-9c58d8269b3bdfdbe500b52ccce878ff2edb196b.tar.gz android_packages_apps_Trebuchet-9c58d8269b3bdfdbe500b52ccce878ff2edb196b.tar.bz2 android_packages_apps_Trebuchet-9c58d8269b3bdfdbe500b52ccce878ff2edb196b.zip |
Fix issue where deleting item from folder leaves extra page
Change-Id: Ie741dbe5341d8237c85f732b26661d084b99f6e2
-rw-r--r-- | src/com/android/launcher3/Folder.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 9637bbb48..37a947c3a 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -772,7 +772,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } completeDragExit(); } - } else { + } + + // This is kind of hacky, but in general, dropping on the workspace handles removing + // the extra screen, but dropping elsewhere (back to self, or onto delete) doesn't. + if (target != mLauncher.getWorkspace()) { mLauncher.getWorkspace().removeExtraEmptyScreen(true, null); } |