diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-23 23:17:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-23 23:17:06 +0000 |
| commit | 1c6dee72042cb20cd8ce12064305acdade7ebb8a (patch) | |
| tree | c6888a497359789a3821c84a712c20c7e74aebe0 /src/com/android/launcher3 | |
| parent | 03a526b2766f65822ed1a12d212e9e7618a74593 (diff) | |
| parent | e97a3b3ff8eb54219a4a7cea455322ad362a6dae (diff) | |
| download | android_packages_apps_Trebuchet-1c6dee72042cb20cd8ce12064305acdade7ebb8a.tar.gz android_packages_apps_Trebuchet-1c6dee72042cb20cd8ce12064305acdade7ebb8a.tar.bz2 android_packages_apps_Trebuchet-1c6dee72042cb20cd8ce12064305acdade7ebb8a.zip | |
Merge "Fix issue where empty page doesn't get deleted when flinging to delete a widget in spring loaded" into jb-ub-now-jetsonic
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/AppsCustomizePagedView.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 0d806bc7f..175d5f83e 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -811,9 +811,16 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen !(target instanceof DeleteDropTarget))) { // Exit spring loaded mode if we have not successfully dropped or have not handled the // drop in Workspace - mLauncher.exitSpringLoadedDragMode(); + mLauncher.getWorkspace().removeExtraEmptyScreen(true, new Runnable() { + @Override + public void run() { + mLauncher.exitSpringLoadedDragMode(); + mLauncher.unlockScreenOrientation(false); + } + }); + } else { + mLauncher.unlockScreenOrientation(false); } - mLauncher.unlockScreenOrientation(false); } @Override |