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

* commit '0259c629cb5b280d0d9c821f8b1685707d7ba589': Fix issue where deleting item from folder leaves extra page
2014-02-14 20:38:58 +00:00
parent 1cf23e10c6 0259c629cb
commit 8df1285d0d
1 changed files with 5 additions and 1 deletions
@@ -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);
        }