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

Commit 12eeecc3 authored by András Klöczl's avatar András Klöczl Committed by Android (Google) Code Review
Browse files

Merge "Update icon and text size for two panel home screen" into sc-dev

parents 21784eaf 6057cb9f

res/values/attrs.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -162,6 +162,8 @@ 
        <!-- landscapeIconSize defaults to iconSize, if not specified -->

        <!-- landscapeIconSize defaults to iconSize, if not specified -->

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

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

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

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

        <!-- landscapeIconTextSize defaults to iconTextSize, if not specified -->

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

        <!-- If true, this display option is used to determine the default grid -->

        <!-- If true, this display option is used to determine the default grid -->

        <attr name="canBeDefault" format="boolean" />

        <attr name="canBeDefault" format="boolean" />

src/com/android/launcher3/DeviceProfile.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -506,9 +506,10 @@ public class DeviceProfile { 




        // Workspace

        // Workspace

        final boolean isVerticalLayout = isVerticalBarLayout();

        final boolean isVerticalLayout = isVerticalBarLayout();

        float invIconSizeDp = isVerticalLayout ? inv.landscapeIconSize : inv.iconSize;

        float invIconSizeDp = isLandscape ? inv.landscapeIconSize : inv.iconSize;

        iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mInfo.metrics, scale));

        iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mInfo.metrics, scale));

        iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, mInfo.metrics) * scale);

        float invIconTextSizeSp = isLandscape ? inv.landscapeIconTextSize : inv.iconTextSize;

        iconTextSizePx = (int) (Utilities.pxFromSp(invIconTextSizeSp, mInfo.metrics) * scale);

        iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);

        iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);





        setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale));

        setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale));

src/com/android/launcher3/InvariantDeviceProfile.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -106,6 +106,7 @@ public class InvariantDeviceProfile { 
    public float iconSize;

    public float iconSize;

    public String iconShapePath;

    public String iconShapePath;

    public float landscapeIconSize;

    public float landscapeIconSize;

    public float landscapeIconTextSize;

    public int iconBitmapSize;

    public int iconBitmapSize;

    public int fillResIconDpi;

    public int fillResIconDpi;

    public float iconTextSize;

    public float iconTextSize;
@@ -163,6 +164,7 @@ public class InvariantDeviceProfile { 
        landscapeIconSize = p.landscapeIconSize;

        landscapeIconSize = p.landscapeIconSize;

        iconBitmapSize = p.iconBitmapSize;

        iconBitmapSize = p.iconBitmapSize;

        iconTextSize = p.iconTextSize;

        iconTextSize = p.iconTextSize;

        landscapeIconTextSize = p.landscapeIconTextSize;

        numHotseatIcons = p.numHotseatIcons;

        numHotseatIcons = p.numHotseatIcons;

        numAllAppsColumns = p.numAllAppsColumns;

        numAllAppsColumns = p.numAllAppsColumns;

        isScalable = p.isScalable;

        isScalable = p.isScalable;
@@ -293,6 +295,7 @@ public class InvariantDeviceProfile { 
        landscapeIconSize = displayOption.landscapeIconSize;

        landscapeIconSize = displayOption.landscapeIconSize;

        iconBitmapSize = ResourceUtils.pxFromDp(iconSize, displayInfo.metrics);

        iconBitmapSize = ResourceUtils.pxFromDp(iconSize, displayInfo.metrics);

        iconTextSize = displayOption.iconTextSize;

        iconTextSize = displayOption.iconTextSize;

        landscapeIconTextSize = displayOption.landscapeIconTextSize;

        fillResIconDpi = getLauncherIconDensity(iconBitmapSize);

        fillResIconDpi = getLauncherIconDensity(iconBitmapSize);





        minCellHeight = displayOption.minCellHeight;

        minCellHeight = displayOption.minCellHeight;
@@ -678,6 +681,7 @@ public class InvariantDeviceProfile { 
        private float iconSize;

        private float iconSize;

        private float iconTextSize;

        private float iconTextSize;

        private float landscapeIconSize;

        private float landscapeIconSize;

        private float landscapeIconTextSize;

        private float allAppsIconSize;

        private float allAppsIconSize;

        private float allAppsIconTextSize;

        private float allAppsIconTextSize;
@@ -702,6 +706,8 @@ public class InvariantDeviceProfile { 
            landscapeIconSize = a.getFloat(R.styleable.ProfileDisplayOption_landscapeIconSize,

            landscapeIconSize = a.getFloat(R.styleable.ProfileDisplayOption_landscapeIconSize,

                    iconSize);

                    iconSize);

            iconTextSize = a.getFloat(R.styleable.ProfileDisplayOption_iconTextSize, 0);

            iconTextSize = a.getFloat(R.styleable.ProfileDisplayOption_iconTextSize, 0);

            landscapeIconTextSize = a.getFloat(

                    R.styleable.ProfileDisplayOption_landscapeIconTextSize, iconTextSize);





            allAppsIconSize = a.getFloat(R.styleable.ProfileDisplayOption_allAppsIconSize,

            allAppsIconSize = a.getFloat(R.styleable.ProfileDisplayOption_allAppsIconSize,

                    iconSize);

                    iconSize);
@@ -731,6 +737,7 @@ public class InvariantDeviceProfile { 
            landscapeIconSize *= w;

            landscapeIconSize *= w;

            allAppsIconSize *= w;

            allAppsIconSize *= w;

            iconTextSize *= w;

            iconTextSize *= w;

            landscapeIconTextSize *= w;

            allAppsIconTextSize *= w;

            allAppsIconTextSize *= w;

            minCellHeight *= w;

            minCellHeight *= w;

            minCellWidth *= w;

            minCellWidth *= w;
@@ -744,6 +751,7 @@ public class InvariantDeviceProfile { 
            landscapeIconSize += p.landscapeIconSize;

            landscapeIconSize += p.landscapeIconSize;

            allAppsIconSize += p.allAppsIconSize;

            allAppsIconSize += p.allAppsIconSize;

            iconTextSize += p.iconTextSize;

            iconTextSize += p.iconTextSize;

            landscapeIconTextSize += p.landscapeIconTextSize;

            allAppsIconTextSize += p.allAppsIconTextSize;

            allAppsIconTextSize += p.allAppsIconTextSize;

            minCellHeight += p.minCellHeight;

            minCellHeight += p.minCellHeight;

            minCellWidth += p.minCellWidth;

            minCellWidth += p.minCellWidth;