commit 9c58d8269b3bdfdbe500b52ccce878ff2edb196b
author Adam Cohen <adamcohen@google.com> Fri Dec 13 17:18:10 2013 -0800
committer Adam Cohen <adamcohen@google.com> Fri Dec 13 17:18:25 2013 -0800
tree 3840511ef8e02b2c98bc8039a9d3c92ab6069641
parent 674531f26196502db825838b21b9cbf34463088c

Fix issue where deleting item from folder leaves extra page

Change-Id: Ie741dbe5341d8237c85f732b26661d084b99f6e2

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 9637bbb..37a947c 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -772,7 +772,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);
         }