Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a81e8d85 authored by Adam Cohen's avatar Adam Cohen
Browse files

Demo mode default layout support 

b/67062454

Change-Id: Ic060d3d7dba4fffe688dddf7cd04c48e4baaf813
parent 510fdfbc

res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ 
        <attr name="iconTextSize" format="float" />



        <attr name="defaultLayoutId" format="reference" />

        <attr name="demoModeLayoutId" format="reference" />

    </declare-styleable>



    <declare-styleable name="CellLayout">

src/com/android/launcher3/InvariantDeviceProfile.java

+8 −3
Original line number Diff line number Diff line
@@ -85,7 +85,9 @@ public class InvariantDeviceProfile { 
     * Number of icons inside the hotseat area.

     */

    public int numHotseatIcons;



    int defaultLayoutId;

    int demoModeLayoutId;



    public DeviceProfile landscapeProfile;

    public DeviceProfile portraitProfile;
@@ -99,11 +101,11 @@ public class InvariantDeviceProfile { 
        this(p.name, p.minWidthDps, p.minHeightDps, p.numRows, p.numColumns,

                p.numFolderRows, p.numFolderColumns, p.minAllAppsPredictionColumns,

                p.iconSize, p.landscapeIconSize, p.iconTextSize, p.numHotseatIcons,

                p.defaultLayoutId);

                p.defaultLayoutId, p.demoModeLayoutId);

    }



    InvariantDeviceProfile(String n, float w, float h, int r, int c, int fr, int fc, int maapc,

            float is, float lis, float its, int hs, int dlId) {

            float is, float lis, float its, int hs, int dlId, int dmlId) {

        name = n;

        minWidthDps = w;

        minHeightDps = h;
@@ -117,6 +119,7 @@ public class InvariantDeviceProfile { 
        iconTextSize = its;

        numHotseatIcons = hs;

        defaultLayoutId = dlId;

        demoModeLayoutId = dmlId;

    }



    @TargetApi(23)
@@ -144,6 +147,7 @@ public class InvariantDeviceProfile { 
        numColumns = closestProfile.numColumns;

        numHotseatIcons = closestProfile.numHotseatIcons;

        defaultLayoutId = closestProfile.defaultLayoutId;

        demoModeLayoutId = closestProfile.demoModeLayoutId;

        numFolderRows = closestProfile.numFolderRows;

        numFolderColumns = closestProfile.numFolderColumns;

        minAllAppsPredictionColumns = closestProfile.minAllAppsPredictionColumns;
@@ -208,7 +212,8 @@ public class InvariantDeviceProfile { 
                            a.getFloat(R.styleable.InvariantDeviceProfile_landscapeIconSize, iconSize),

                            a.getFloat(R.styleable.InvariantDeviceProfile_iconTextSize, 0),

                            a.getInt(R.styleable.InvariantDeviceProfile_numHotseatIcons, numColumns),

                            a.getResourceId(R.styleable.InvariantDeviceProfile_defaultLayoutId, 0)));

                            a.getResourceId(R.styleable.InvariantDeviceProfile_defaultLayoutId, 0),

                            a.getResourceId(R.styleable.InvariantDeviceProfile_demoModeLayoutId, 0)));

                    a.recycle();

                }

            }

src/com/android/launcher3/LauncherProvider.java

+8 −1
Original line number Diff line number Diff line
@@ -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);

    }