am 0b2b235c: am 019f5892: Merge "Fix issue with extra empty screen left over after widget add cancel (issue 10865959)" into jb-ub-now-indigo-rose
* commit '0b2b235c06f162c19f873da55b0d4d87844ec111':
Fix issue with extra empty screen left over after widget add cancel (issue 10865959)
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