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 '36402251fabc1c0b0c1a5c6e3926c219047166f2':
  Fix issue where empty page doesn't get deleted when flinging to delete a widget in spring loaded

src/com/android/launcher3/AppsCustomizePagedView.java

@@ -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