From 378c11f041dd17069106e213dc5accf0e113eff8 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Wed, 10 Mar 2021 10:28:50 -0500 Subject: [PATCH] Fix icon text size being calculated in DP instead of SP. Bug: 175329686 Test: manual, change font/display size Change-Id: Ic8c6260444d18df64ccee4c2bcfbc2332a327da9 --- src/com/android/launcher3/DeviceProfile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 7beea74c0c..adafea2f4c 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -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));