commit be87647e2ade2f442159e60da81d1c5a57eba8a9
author Winson Chung <winsonc@google.com> Wed May 14 14:15:20 2014 -0700
committer Winson Chung <winsonc@google.com> Fri May 16 12:33:38 2014 -0700
tree 787e750408964babed5921cfebc4f5c5c0231624
parent 244637b59c328b918c6b2e1aef33ba448728207d

Adding support for dynamically resolved default layouts.

Change-Id: Id05c60b93423ce37dd06a126ecf33c74a0ba1d62

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 437c2ad..93708b5 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -336,10 +336,12 @@
     }
 
     private static int getDefaultWorkspaceResourceId() {
+        LauncherAppState app = LauncherAppState.getInstance();
+        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
         if (LauncherAppState.isDisableAllApps()) {
-            return R.xml.default_workspace_no_all_apps;
+            return grid.defaultNoAllAppsLayoutId;
         } else {
-            return R.xml.default_workspace;
+            return grid.defaultLayoutId;
         }
     }