am c178c865: am 36402251: am 1c6dee72: Merge "Fix issue where empty page doesn\'t get deleted when flinging to delete a widget in spring loaded" into jb-ub-now-jetsonic

* commit 'c178c8657e934e54d300d0b40a27eec4ad39a3c2': Fix issue where empty page doesn't get deleted when flinging to delete a widget in spring loaded
2014-02-14 20:52:38 +00:00
parent 52cdcb1e83 c178c8657e
commit 82766b62ca
1 changed files with 9 additions and 2 deletions
@@ -811,9 +811,16 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
                !(target instanceof DeleteDropTarget))) {
            // Exit spring loaded mode if we have not successfully dropped or have not handled the
            // drop in Workspace
-            mLauncher.exitSpringLoadedDragMode();
+            mLauncher.getWorkspace().removeExtraEmptyScreen(true, new Runnable() {
+                @Override
+                public void run() {
+                    mLauncher.exitSpringLoadedDragMode();
+                    mLauncher.unlockScreenOrientation(false);
+                }
+            });
+        } else {
+            mLauncher.unlockScreenOrientation(false);
        }
-        mLauncher.unlockScreenOrientation(false);
    }

    @Override