commit e97a3b3ff8eb54219a4a7cea455322ad362a6dae
author Adam Cohen <adamcohen@google.com> Wed Oct 23 16:11:50 2013 -0700
committer Adam Cohen <adamcohen@google.com> Wed Oct 23 16:15:33 2013 -0700
tree 1c3aa57a866d1cb543b605c94bc5820efee7b5c7
parent a718fc279d01303026bc7d77f0f55528149172ee

Fix issue where empty page doesn't get deleted when flinging to delete a widget in spring loaded

Change-Id: I59a78a4b9135b2c96f0adb4a2e63b19d504706b7

src/com/android/launcher3/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 0d806bc..175d5f8 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -811,9 +811,16 @@
                 !(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