diff options
author | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
---|---|---|
committer | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
commit | 826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec (patch) | |
tree | 1ba6f2151cba45b5e7d07cd61a44f6b59a3f828f /src/com/android/launcher2/LauncherProvider.java | |
parent | ca83eeb0919b690350d86a9562f58a5a56d196bf (diff) | |
parent | a3e22d6a362260d5b81feefbc91e4757e3d58958 (diff) | |
download | android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.gz android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.bz2 android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.zip |
resolved conflicts for merge of a3e22d6a to master
Change-Id: I8770574acf86e280a9d15d4309686111260e09d9
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"); } |