diff options
author | Adam Cohen <adamcohen@google.com> | 2013-06-25 20:23:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-25 20:23:57 +0000 |
commit | 5ccb418b0913a5ac6d0c5d601c01b1b01b0e7f3c (patch) | |
tree | ee3c706d3cb09e4a6a72f3bab8daf34db3b20d85 /src/com/android/launcher3/Hotseat.java | |
parent | 49883409ff9bbdbaa327c98cdd75e109b6a46be7 (diff) | |
parent | dcd297f05a866e07090d6e2af8fb4b15f28cb555 (diff) | |
download | android_packages_apps_Trebuchet-5ccb418b0913a5ac6d0c5d601c01b1b01b0e7f3c.tar.gz android_packages_apps_Trebuchet-5ccb418b0913a5ac6d0c5d601c01b1b01b0e7f3c.tar.bz2 android_packages_apps_Trebuchet-5ccb418b0913a5ac6d0c5d601c01b1b01b0e7f3c.zip |
Merge "Initial implementation of Shrink-wrap" into jb-ub-gel-agar
Diffstat (limited to 'src/com/android/launcher3/Hotseat.java')
-rw-r--r-- | src/com/android/launcher3/Hotseat.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index 50f7efd20..93f39ff3b 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -122,10 +122,10 @@ public class Hotseat extends FrameLayout { fi.spanX = 1; fi.spanY = 1; fi.container = LauncherSettings.Favorites.CONTAINER_HOTSEAT; - fi.screen = mAllAppsButtonRank; + fi.screenId = mAllAppsButtonRank; fi.itemType = LauncherSettings.Favorites.ITEM_TYPE_FOLDER; fi.title = "All Apps"; - LauncherModel.addItemToDatabase(launcher, fi, fi.container, fi.screen, fi.cellX, + LauncherModel.addItemToDatabase(launcher, fi, fi.container, fi.screenId, fi.cellX, fi.cellY, false); FolderIcon folder = FolderIcon.fromXml(R.layout.folder_icon, launcher, getLayout(), fi, iconCache); |