diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-31 15:03:35 -0700 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-05 23:35:03 -0700 |
| commit | b2af81a33cd23d2c92ce09b83b97db08e8cb6942 (patch) | |
| tree | c4e90a562b2743294546e191a16a410ec09aa318 /src/com/android/launcher3/Workspace.java | |
| parent | 86e2ac3bb6119d730521ac8ff5cab11d77ee28e1 (diff) | |
| download | android_packages_apps_Trebuchet-b2af81a33cd23d2c92ce09b83b97db08e8cb6942.tar.gz android_packages_apps_Trebuchet-b2af81a33cd23d2c92ce09b83b97db08e8cb6942.tar.bz2 android_packages_apps_Trebuchet-b2af81a33cd23d2c92ce09b83b97db08e8cb6942.zip | |
Fix issue with adding widget with config activity to empty screen (issue 11381059)
Change-Id: Ic7eecb30422e7a6cf35ebe8470d9eba8752d406e
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 806129e73..f1287aa1d 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -716,7 +716,8 @@ public class Workspace extends SmoothPagedView CellLayout finalScreen = mWorkspaceScreens.get(finalScreenId); // If the final screen is empty, convert it to the extra empty screen - if (finalScreen.getShortcutsAndWidgets().getChildCount() == 0) { + if (finalScreen.getShortcutsAndWidgets().getChildCount() == 0 && + !finalScreen.isDropPending()) { mWorkspaceScreens.remove(finalScreenId); mScreenOrder.remove(finalScreenId); |