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

* commit '8df1285d0d1291adb3eeab66f9a1b1b77c5cbb73': Fix issue where deleting item from folder leaves extra page
2014-02-14 20:54:53 +00:00
parent 84ae085dc7 8df1285d0d
commit 537ecd451b
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);
        }