commit 0007472e20e02589a6305e1aeaa70770963ebec7
author Adam Cohen <adamcohen@google.com> Fri Oct 11 17:46:09 2013 -0700
committer Adam Cohen <adamcohen@google.com> Fri Oct 11 17:46:39 2013 -0700
tree e3359df56be65367008fed0209949b4442d32a1f
parent f7d458543e64307b01de803d2ddfee2f21b0bd28

Fix issue with extra empty screen left over after widget add cancel (issue 10865959)

Change-Id: Iee72fe1b296e81a5f2d04f6edcbf9cac19aff992

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 278b13c..ee13f29 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -736,6 +736,7 @@
                 Log.e(TAG, "Error: appWidgetId (EXTRA_APPWIDGET_ID) was not returned from the \\" +
                         "widget configuration activity.");
                 completeTwoStageWidgetDrop(RESULT_CANCELED, appWidgetId);
+                mWorkspace.stripEmptyScreens();
             } else {
                 completeTwoStageWidgetDrop(resultCode, appWidgetId);
             }
@@ -760,6 +761,8 @@
             } else {
                 delayExitSpringLoadedMode = completeAdd(args);
             }
+        } else if (resultCode == RESULT_CANCELED) {
+            mWorkspace.stripEmptyScreens();
         }
         mDragLayer.clearAnimatedView();
         // Exit spring loaded mode if necessary after cancelling the configuration of a widget