diff options
| author | Nilesh Agrawal <nileshagrawal@google.com> | 2013-12-09 20:40:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-12-09 20:40:05 +0000 |
| commit | 93b6ee6dfaa954747c9b107e147d57ea4866f78d (patch) | |
| tree | da538ef3e0182f2e46f4738cc9011bdcbf4c638e /src/com/android/launcher3/LauncherProvider.java | |
| parent | 23c165a990a5faa11d9b63b437005cf6e3c4d83e (diff) | |
| parent | d85ee9b994e21cb500c89349ce31ce89e564b513 (diff) | |
| download | android_packages_apps_Trebuchet-93b6ee6dfaa954747c9b107e147d57ea4866f78d.tar.gz android_packages_apps_Trebuchet-93b6ee6dfaa954747c9b107e147d57ea4866f78d.tar.bz2 android_packages_apps_Trebuchet-93b6ee6dfaa954747c9b107e147d57ea4866f78d.zip | |
Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 28efd0148..27b7dae2a 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -270,8 +270,7 @@ public class LauncherProvider extends ContentProvider { // Use default workspace resource if none provided if (workspaceResId == 0) { - workspaceResId = - sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, getDefaultWorkspaceResourceId()); + workspaceResId = sp.getInt(DEFAULT_WORKSPACE_RESOURCE_ID, R.xml.default_workspace); } // Populate favorites table with initial favorites @@ -287,14 +286,6 @@ 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); } |