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

Commit fb7b9fd8 authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Fix icon text size being calculated in DP instead of SP." into sc-dev

parents a061cf33 378c11f0

src/com/android/launcher3/DeviceProfile.java

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

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

        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);



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