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

Commit 378c11f0 authored by Jon Miranda's avatar Jon Miranda
Browse files

Fix icon text size being calculated in DP instead of SP. 

Bug: 175329686
Test: manual, change font/display size
Change-Id: Ic8c6260444d18df64ccee4c2bcfbc2332a327da9
parent aa47630e

src/com/android/launcher3/DeviceProfile.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -472,7 +472,7 @@ public class DeviceProfile { 
        final boolean isVerticalLayout = isVerticalBarLayout();

        final boolean isVerticalLayout = isVerticalBarLayout();

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

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

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

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

        iconTextSizePx = pxFromDp(inv.iconTextSize, mInfo.metrics, scale);

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

        iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);

        iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);





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

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