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

Commit dd027348 authored by Thales Lima's avatar Thales Lima
Browse files

create 6x5 scalable grid for tablets 

Create more attributes for landscape and fix the space between icons in the hotseat. The dimensions are correct but some size might differ from mocks because of device scaling, qsb position and insets not finalized.

Bug: 210118169
Test: visual, using HSV and Window
Change-Id: Ie505923dce2e30133eb1e5c9c83c33a2895147f2
parent 3b7ae6e7

res/values/attrs.xml

+8 −0
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@ 
        <attr name="minCellHeight" format="float" />

        <attr name="minCellWidth" format="float" />

        <!-- defaults to minCellHeight, if not specified -->

        <attr name="minCellHeightLandscape" format="float" />

        <!-- defaults to minCellWidth, if not specified -->

        <attr name="minCellWidthLandscape" format="float" />

        <!-- defaults to minCellHeight, if not specified -->

        <attr name="minCellHeightTwoPanelPortrait" format="float" />

        <!-- defaults to minCellWidth, if not specified -->

        <attr name="minCellWidthTwoPanelPortrait" format="float" />
@@ -242,6 +246,8 @@ 
        <!-- defaults to borderSpaceDps, if not specified -->

        <attr name="hotseatBorderSpace" format="float" />

        <!-- defaults to hotseatBorderSpace, if not specified -->

        <attr name="hotseatBorderSpaceLandscape" format="float" />

        <!-- defaults to hotseatBorderSpace, if not specified -->

        <attr name="hotseatBorderSpaceTwoPanelLandscape" format="float" />

        <!-- defaults to hotseatBorderSpace, if not specified -->

        <attr name="hotseatBorderSpaceTwoPanelPortrait" format="float" />
@@ -268,6 +274,8 @@ 
        <!-- Margin on left and right of the workspace when GridDisplayOption#isScalable is true -->

        <attr name="horizontalMargin" format="float"/>

        <!-- defaults to horizontalMargin if not specified -->

        <attr name="horizontalMarginLandscape" format="float"/>

        <!-- defaults to horizontalMargin if not specified -->

        <attr name="horizontalMarginTwoPanelLandscape" format="float"/>

        <!-- defaults to horizontalMargin if not specified -->

        <attr name="horizontalMarginTwoPanelPortrait" format="float"/>

src/com/android/launcher3/CellLayout.java

+13 −3
Original line number Diff line number Diff line
@@ -238,9 +238,19 @@ public class CellLayout extends ViewGroup { 
        mActivity = ActivityContext.lookupContext(context);

        DeviceProfile deviceProfile = mActivity.getDeviceProfile();



        mBorderSpace = mContainerType == FOLDER

                ? new Point(deviceProfile.folderCellLayoutBorderSpacePx)

                : new Point(deviceProfile.cellLayoutBorderSpacePx);

        switch (mContainerType) {

            case FOLDER:

                mBorderSpace = new Point(deviceProfile.folderCellLayoutBorderSpacePx);

                break;

            case HOTSEAT:

                mBorderSpace = new Point(deviceProfile.hotseatBorderSpace,

                        deviceProfile.hotseatBorderSpace);

                break;

            case WORKSPACE:

            default:

                mBorderSpace = new Point(deviceProfile.cellLayoutBorderSpacePx);

                break;

        }



        mCellWidth = mCellHeight = -1;

        mFixedCellWidth = mFixedCellHeight = -1;

src/com/android/launcher3/DeviceProfile.java

+2 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public class DeviceProfile { 
    public final int hotseatBarSidePaddingStartPx;

    public final int hotseatBarSidePaddingEndPx;

    public final int hotseatQsbHeight;

    public final int hotseatBorderSpace;

    public int hotseatBorderSpace;



    public final float qsbBottomMarginOriginalPx;

    public int qsbBottomMarginPx;
@@ -716,6 +716,7 @@ public class DeviceProfile { 
        }



        // Hotseat

        hotseatBorderSpace = pxFromDp(inv.hotseatBorderSpaces[mTypeIndex], mMetrics, scale);

        updateHotseatIconSize(iconSizePx);



        if (!isVerticalLayout) {

src/com/android/launcher3/InvariantDeviceProfile.java

+11 −2
Original line number Diff line number Diff line
@@ -789,6 +789,11 @@ public class InvariantDeviceProfile { 
            x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidth, 0);

            y = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeight, 0);

            minCellSize[INDEX_DEFAULT] = new PointF(x, y);



            x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthLandscape,

                    minCellSize[INDEX_DEFAULT].x);

            y = a.getFloat(R.styleable.ProfileDisplayOption_minCellHeightLandscape,

                    minCellSize[INDEX_DEFAULT].y);

            minCellSize[INDEX_LANDSCAPE] = new PointF(x, y);



            x = a.getFloat(R.styleable.ProfileDisplayOption_minCellWidthTwoPanelPortrait,
@@ -891,7 +896,9 @@ public class InvariantDeviceProfile { 


            horizontalMargin[INDEX_DEFAULT] = a.getFloat(

                    R.styleable.ProfileDisplayOption_horizontalMargin, 0);

            horizontalMargin[INDEX_LANDSCAPE] = horizontalMargin[INDEX_DEFAULT];

            horizontalMargin[INDEX_LANDSCAPE] = a.getFloat(

                    R.styleable.ProfileDisplayOption_horizontalMarginLandscape,

                    horizontalMargin[INDEX_DEFAULT]);

            horizontalMargin[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(

                    R.styleable.ProfileDisplayOption_horizontalMarginTwoPanelLandscape,

                    horizontalMargin[INDEX_DEFAULT]);
@@ -901,7 +908,9 @@ public class InvariantDeviceProfile { 


            hotseatBorderSpaces[INDEX_DEFAULT] = a.getFloat(

                    R.styleable.ProfileDisplayOption_hotseatBorderSpace, borderSpace);

            hotseatBorderSpaces[INDEX_LANDSCAPE] = hotseatBorderSpaces[INDEX_DEFAULT];

            hotseatBorderSpaces[INDEX_LANDSCAPE] = a.getFloat(

                    R.styleable.ProfileDisplayOption_hotseatBorderSpaceLandscape,

                    hotseatBorderSpaces[INDEX_DEFAULT]);

            hotseatBorderSpaces[INDEX_TWO_PANEL_LANDSCAPE] = a.getFloat(

                    R.styleable.ProfileDisplayOption_hotseatBorderSpaceTwoPanelLandscape,

                    hotseatBorderSpaces[INDEX_DEFAULT]);