diff options
| author | Winson Chung <winsonc@google.com> | 2014-05-16 19:42:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-16 19:42:03 +0000 |
| commit | dbc46f5e05d035524eff7fb1ea3ac8681b6b673a (patch) | |
| tree | 61e892530ebd97421d156f4d6bccb325d0c3cac2 /src/com/android/launcher3/LauncherProvider.java | |
| parent | ca853c4a351991c3be8b0939733990d88249a61e (diff) | |
| parent | be87647e2ade2f442159e60da81d1c5a57eba8a9 (diff) | |
| download | android_packages_apps_Trebuchet-dbc46f5e05d035524eff7fb1ea3ac8681b6b673a.tar.gz android_packages_apps_Trebuchet-dbc46f5e05d035524eff7fb1ea3ac8681b6b673a.tar.bz2 android_packages_apps_Trebuchet-dbc46f5e05d035524eff7fb1ea3ac8681b6b673a.zip | |
Merge "Adding support for dynamically resolved default layouts." into ub-now-nova
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 4a5096564..55a0f5e36 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; } } |