diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-01-09 19:14:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-09 19:14:52 +0000 |
| commit | 0259c629cb5b280d0d9c821f8b1685707d7ba589 (patch) | |
| tree | 565b4380151c08f7b22524f1fe4d10af8d86acac /src/com/android/launcher3/Folder.java | |
| parent | 8661761cb691d9bed446b87d55a4fa7043a3aa95 (diff) | |
| parent | 9c58d8269b3bdfdbe500b52ccce878ff2edb196b (diff) | |
| download | android_packages_apps_Trebuchet-0259c629cb5b280d0d9c821f8b1685707d7ba589.tar.gz android_packages_apps_Trebuchet-0259c629cb5b280d0d9c821f8b1685707d7ba589.tar.bz2 android_packages_apps_Trebuchet-0259c629cb5b280d0d9c821f8b1685707d7ba589.zip | |
Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
| -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 ca82bd1a7..758ee5bab 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -773,7 +773,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); } |