From 0007472e20e02589a6305e1aeaa70770963ebec7 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Fri, 11 Oct 2013 17:46:09 -0700
Subject: [PATCH] Fix issue with extra empty screen left over after widget add
 cancel (issue 10865959)

Change-Id: Iee72fe1b296e81a5f2d04f6edcbf9cac19aff992
---
 src/com/android/launcher3/Launcher.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 278b13c182..ee13f29467 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/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