commit 2782449da6538e19ae8fdcdd56bb524937fcd604
author Adam Cohen <adamcohen@google.com> Fri Sep 22 17:10:55 2017 -0700
committer Adam Cohen <adamcohen@google.com> Fri Sep 29 15:49:34 2017 +0000
tree 965fac5258fe2d011aa838811bcb4b569c30f21f
parent 48a4e91c73309342da224c218bbfb780ea30efed

Demo mode default layout support

67062454

Change-Id: Ic060d3d7dba4fffe688dddf7cd04c48e4baaf813

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 4813571..7bfa70c 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -552,7 +552,14 @@
     }
 
     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);
     }