diff options
author | Andrew Flynn <flynn@google.com> | 2012-03-01 10:19:02 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-01 10:19:02 -0800 |
commit | a3e22d6a362260d5b81feefbc91e4757e3d58958 (patch) | |
tree | d04dd3b450d5b455ff539f688b997d56447f64ad /src/com/android/launcher2/LauncherProvider.java | |
parent | 9168509491a5d052f28af71b99f6980ef859ca4d (diff) | |
parent | 0dca1ec41479a74f8da080224fa0c7eacab674d6 (diff) | |
download | android_packages_apps_Trebuchet-a3e22d6a362260d5b81feefbc91e4757e3d58958.tar.gz android_packages_apps_Trebuchet-a3e22d6a362260d5b81feefbc91e4757e3d58958.tar.bz2 android_packages_apps_Trebuchet-a3e22d6a362260d5b81feefbc91e4757e3d58958.zip |
am 0dca1ec4: New small/large screen division for Launcher.
* commit '0dca1ec41479a74f8da080224fa0c7eacab674d6':
New small/large screen division for Launcher.
Diffstat (limited to 'src/com/android/launcher2/LauncherProvider.java')
-rw-r--r-- | src/com/android/launcher2/LauncherProvider.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher2/LauncherProvider.java b/src/com/android/launcher2/LauncherProvider.java index a01cc479b..de9a9b2de 100644 --- a/src/com/android/launcher2/LauncherProvider.java +++ b/src/com/android/launcher2/LauncherProvider.java @@ -706,6 +706,8 @@ public class LauncherProvider extends ContentProvider { ContentValues values = new ContentValues(); PackageManager packageManager = mContext.getPackageManager(); + int allAppsButtonRank = + mContext.getResources().getInteger(R.integer.hotseat_all_apps_index); int i = 0; try { XmlResourceParser parser = mContext.getResources().getXml(workspaceResourceId); @@ -739,8 +741,8 @@ public class LauncherProvider extends ContentProvider { // If we are adding to the hotseat, the screen is used as the position in the // hotseat. This screen can't be at position 0 because AllApps is in the // zeroth position. - if (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT && - Hotseat.isAllAppsButtonRank(Integer.valueOf(screen))) { + if (container == LauncherSettings.Favorites.CONTAINER_HOTSEAT + && Integer.valueOf(screen) == allAppsButtonRank) { throw new RuntimeException("Invalid screen position for hotseat item"); } |