am 019f5892: Merge "Fix issue with extra empty screen left over after widget add cancel (issue 10865959)" into jb-ub-now-indigo-rose

* commit '019f5892b90b4d37ff41d34f12dd0becfff6c5ef':
  Fix issue with extra empty screen left over after widget add cancel (issue 10865959)

src/com/android/launcher3/Launcher.java

@@ -736,6 +736,7 @@ public class Launcher extends Activity
                 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 @@ public class Launcher extends Activity
             } 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