diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-11 17:59:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 17:59:48 -0700 |
| commit | 47747fd44f3b5e4f37d01055d949eec721490d97 (patch) | |
| tree | 8d2a20a83e2f29b0fc0a624818b16036598e2f74 | |
| parent | bc8da2c7536c3a632f7d03aa27b77025e15d298a (diff) | |
| parent | 0b2b235c06f162c19f873da55b0d4d87844ec111 (diff) | |
| download | android_packages_apps_Trebuchet-47747fd44f3b5e4f37d01055d949eec721490d97.tar.gz android_packages_apps_Trebuchet-47747fd44f3b5e4f37d01055d949eec721490d97.tar.bz2 android_packages_apps_Trebuchet-47747fd44f3b5e4f37d01055d949eec721490d97.zip | |
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)
| -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 |