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

Commit c307cd13 authored by Thales Lima's avatar Thales Lima Committed by Android (Google) Code Review
Browse files

Merge "Add more border space options" into tm-dev

parents 2017ee02 44cc3a2e

res/values/attrs.xml

+7 −0
Original line number Diff line number Diff line
@@ -215,6 +215,13 @@ 
        <attr name="borderSpaceHorizontal" format="float" />

        <!-- space below the cell, defaults to borderSpace if not specified -->

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

        <!-- space to be used horizontally and vertically,

        defaults to borderSpace if not specified -->

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

        <!-- space to the right of the cell, defaults to borderSpaceLandscape if not specified -->

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

        <!-- space below the cell, defaults to borderSpaceLandscape if not specified -->

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

        <!-- space to be used horizontally and vertically in two panels,

        defaults to borderSpace if not specified -->

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

src/com/android/launcher3/InvariantDeviceProfile.java

+7 −0
Original line number Diff line number Diff line
@@ -838,6 +838,8 @@ public class InvariantDeviceProfile { 
            minCellSize[INDEX_TWO_PANEL_LANDSCAPE] = new PointF(x, y);



            float borderSpace = a.getFloat(R.styleable.ProfileDisplayOption_borderSpace, 0);

            float borderSpaceLandscape = a.getFloat(

                    R.styleable.ProfileDisplayOption_borderSpaceLandscape, borderSpace);

            float borderSpaceTwoPanelPortrait = a.getFloat(

                    R.styleable.ProfileDisplayOption_borderSpaceTwoPanelPortrait, borderSpace);

            float borderSpaceTwoPanelLandscape = a.getFloat(
@@ -846,6 +848,11 @@ public class InvariantDeviceProfile { 
            x = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceHorizontal, borderSpace);

            y = a.getFloat(R.styleable.ProfileDisplayOption_borderSpaceVertical, borderSpace);

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



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

                    borderSpaceLandscape);

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

                    borderSpaceLandscape);

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



            x = a.getFloat(