commit 0259c629cb5b280d0d9c821f8b1685707d7ba589
author Adam Cohen <adamcohen@google.com> Thu Jan 09 19:14:52 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 09 19:14:52 2014 +0000
tree 565b4380151c08f7b22524f1fe4d10af8d86acac
parent 8661761cb691d9bed446b87d55a4fa7043a3aa95
parent 9c58d8269b3bdfdbe500b52ccce878ff2edb196b

Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index ca82bd1..758ee5b 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -773,7 +773,11 @@
                 }
                 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);
         }