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

This commit is contained in:
Jonathan Miranda authored and Android (Google) Code Review committed 2021-03-10 19:09:29 +00:00
commit fb7b9fd8c3
1 file changed
+1 -1
+1 -1
View File
@@ -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));