summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/LauncherProvider.java
diff options
context:
space:
mode:
authorNilesh Agrawal <nileshagrawal@google.com>2013-12-09 14:17:49 -0800
committerDanesh M <daneshm90@gmail.com>2014-06-06 22:54:21 -0700
commit33832e262378ca9e6da33f43efd406ba692bb530 (patch)
tree7a3880d7c01ff79cd6d8d9cef7c8f5d0988f280c /src/com/android/launcher3/LauncherProvider.java
parent3ca339fe99358b4a8acf6f332b932e00b8e3c292 (diff)
downloadandroid_packages_apps_Trebuchet-33832e262378ca9e6da33f43efd406ba692bb530.tar.gz
android_packages_apps_Trebuchet-33832e262378ca9e6da33f43efd406ba692bb530.tar.bz2
android_packages_apps_Trebuchet-33832e262378ca9e6da33f43efd406ba692bb530.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.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 3cffa3465..fe7e279a3 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -277,7 +277,7 @@ public class LauncherProvider extends ContentProvider {
if (tm.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE) {
workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, R.xml.default_workspace_no_telephony);
} else {
- workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, R.xml.default_workspace);
+ workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, getDefaultWorkspaceResourceId());
}
}
@@ -294,6 +294,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);
}