diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-12 00:56:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-12 00:56:12 +0000 |
| commit | 019f5892b90b4d37ff41d34f12dd0becfff6c5ef (patch) | |
| tree | dee889375bab5249ab95e6b3817112db00271b69 /src | |
| parent | 1226be4398d848fe59ddf9718d9a2939ae5b8e43 (diff) | |
| parent | 0007472e20e02589a6305e1aeaa70770963ebec7 (diff) | |
| download | android_packages_apps_Trebuchet-019f5892b90b4d37ff41d34f12dd0becfff6c5ef.tar.gz android_packages_apps_Trebuchet-019f5892b90b4d37ff41d34f12dd0becfff6c5ef.tar.bz2 android_packages_apps_Trebuchet-019f5892b90b4d37ff41d34f12dd0becfff6c5ef.zip | |
Merge "Fix issue with extra empty screen left over after widget add cancel (issue 10865959)" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 278b13c18..ee13f2946 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 |