diff options
| author | Adam Cohen <adamcohen@google.com> | 2017-09-29 20:38:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-29 20:38:08 +0000 |
| commit | 88312523993a5984bfdcf1cb1841f4a577921c24 (patch) | |
| tree | 98ac79f186a25a67d7af92ae932616b98cc48ce1 /src/com/android/launcher3/LauncherProvider.java | |
| parent | 6b0aa870b821b5531f6eec782542a2b1e0f2c0ee (diff) | |
| parent | ea1212a38a85c7d207a4d092af0a33b5e353f0ad (diff) | |
| download | packages_apps_Trebuchet-88312523993a5984bfdcf1cb1841f4a577921c24.tar.gz packages_apps_Trebuchet-88312523993a5984bfdcf1cb1841f4a577921c24.tar.bz2 packages_apps_Trebuchet-88312523993a5984bfdcf1cb1841f4a577921c24.zip | |
Merge changes from topic "demoModeTopic" into ub-launcher3-dorval-polish2
* changes:
[automerger] Demo mode default layout support am: 2782449da6
Demo mode default layout support
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index dc83f36ad..b31df9894 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -552,7 +552,14 @@ public class LauncherProvider extends ContentProvider { } private DefaultLayoutParser getDefaultLayoutParser(AppWidgetHost widgetHost) { - int defaultLayout = LauncherAppState.getIDP(getContext()).defaultLayoutId; + InvariantDeviceProfile idp = LauncherAppState.getIDP(getContext()); + int defaultLayout = idp.defaultLayoutId; + + UserManagerCompat um = UserManagerCompat.getInstance(getContext()); + if (um.isDemoUser() && idp.demoModeLayoutId != 0) { + defaultLayout = idp.demoModeLayoutId; + } + return new DefaultLayoutParser(getContext(), widgetHost, mOpenHelper, getContext().getResources(), defaultLayout); } |