summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/LauncherProvider.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-05-14 14:15:20 -0700
committerWinson Chung <winsonc@google.com>2014-05-16 12:33:38 -0700
commitbe87647e2ade2f442159e60da81d1c5a57eba8a9 (patch)
tree787e750408964babed5921cfebc4f5c5c0231624 /src/com/android/launcher3/LauncherProvider.java
parent244637b59c328b918c6b2e1aef33ba448728207d (diff)
downloadandroid_packages_apps_Trebuchet-be87647e2ade2f442159e60da81d1c5a57eba8a9.tar.gz
android_packages_apps_Trebuchet-be87647e2ade2f442159e60da81d1c5a57eba8a9.tar.bz2
android_packages_apps_Trebuchet-be87647e2ade2f442159e60da81d1c5a57eba8a9.zip
Adding support for dynamically resolved default layouts.
Change-Id: Id05c60b93423ce37dd06a126ecf33c74a0ba1d62
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
-rw-r--r--src/com/android/launcher3/LauncherProvider.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 437c2ad96..93708b5ed 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -336,10 +336,12 @@ public class LauncherProvider extends ContentProvider {
}
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;
}
}