diff options
author | Nilesh Agrawal <nileshagrawal@google.com> | 2013-12-09 14:17:49 -0800 |
---|---|---|
committer | Nilesh Agrawal <nileshagrawal@google.com> | 2013-12-09 14:37:59 -0800 |
commit | da41ea669890a79a4d2bc57dab9ae03157fd9e75 (patch) | |
tree | e380d787a12678fc779908d97cbd9c4691ac4723 /src/com/android/launcher3/LauncherProvider.java | |
parent | 93b6ee6dfaa954747c9b107e147d57ea4866f78d (diff) | |
download | android_packages_apps_Trebuchet-da41ea669890a79a4d2bc57dab9ae03157fd9e75.tar.gz android_packages_apps_Trebuchet-da41ea669890a79a4d2bc57dab9ae03157fd9e75.tar.bz2 android_packages_apps_Trebuchet-da41ea669890a79a4d2bc57dab9ae03157fd9e75.zip |
Allow 5 hotseat icons in DISABLE_ALL_APPS mode.
Added the xml resource in Launcher3 package as well.
This is a dummy resource with just hotseat icons.
Previously reviewed on: http://ag/396580
Change-Id: I31b0d7d4796d028f44f746260c381f2d8226605a
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 27b7dae2a..28efd0148 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -270,7 +270,8 @@ public class LauncherProvider extends ContentProvider { // Use default workspace resource if none provided if (workspaceResId == 0) { - workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, R.xml.default_workspace); + workspaceResId = + sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, getDefaultWorkspaceResourceId()); } // Populate favorites table with initial favorites @@ -286,6 +287,14 @@ public class LauncherProvider extends ContentProvider { } } + private static int getDefaultWorkspaceResourceId() { + if (AppsCustomizePagedView.DISABLE_ALL_APPS) { + return R.xml.default_workspace_no_all_apps; + } else { + return R.xml.default_workspace; + } + } + private static interface ContentValuesCallback { public void onRow(ContentValues values); } |