diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-03-29 17:25:17 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2012-03-29 17:25:17 -0700 |
| commit | d346171a34f3f6380d7b92629f8991e56829f928 (patch) | |
| tree | 283711241657e60977bb4c724dda8fca0f2f9a1a /src/com/android/launcher2/Workspace.java | |
| parent | ec114055837998906efdf741f91ab168f6c0a6f4 (diff) | |
| download | android_packages_apps_Trebuchet-d346171a34f3f6380d7b92629f8991e56829f928.tar.gz android_packages_apps_Trebuchet-d346171a34f3f6380d7b92629f8991e56829f928.tar.bz2 android_packages_apps_Trebuchet-d346171a34f3f6380d7b92629f8991e56829f928.zip | |
Fix issue where hotseat wasn't being correctly persisted (issue 6259158)
Change-Id: Ie19c0f8e79a91a1021a3576f48e1db7d0c3478e1
Diffstat (limited to 'src/com/android/launcher2/Workspace.java')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 239031f8a..eacafdea2 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3349,14 +3349,22 @@ public class Workspace extends SmoothPagedView void updateItemLocationsInDatabase(CellLayout cl) { int count = cl.getShortcutsAndWidgets().getChildCount(); + int screen = indexOfChild(cl); + int container = Favorites.CONTAINER_DESKTOP; + + if (mLauncher.isHotseatLayout(cl)) { + screen = -1; + container = Favorites.CONTAINER_HOTSEAT; + } + for (int i = 0; i < count; i++) { View v = cl.getShortcutsAndWidgets().getChildAt(i); ItemInfo info = (ItemInfo) v.getTag(); // Null check required as the AllApps button doesn't have an item info if (info != null) { - LauncherModel.moveItemInDatabase(mLauncher, info, Favorites.CONTAINER_DESKTOP, - screen, info.cellX, info.cellY); + LauncherModel.moveItemInDatabase(mLauncher, info, container, screen, info.cellX, + info.cellY); } } } |