commit f4ed1be4ef22c87b002c3bca90d130eb77fe5535
author Nilesh Agrawal <nileshagrawal@google.com> Fri Dec 06 17:56:07 2013 -0800
committer Nilesh Agrawal <nileshagrawal@google.com> Fri Dec 06 17:58:56 2013 -0800
tree 159df7b37a5c29733dcdc81a81af72c5af7d560a
parent 5d518fa77c56a65104f02f40269ad8e43f3431b2

Allow 5 hotseat icons in DISABLE_ALL_APPS mode.

Change-Id: I71510cf079e211bd53e411e6e43f1bc6475f6d35

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 27b7dae..28efd01 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -270,7 +270,8 @@
 
             // 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 @@
         }
     }
 
+    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);
     }