| commit | c3e062733b229072feec6b04b4973fc7720589cb | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Wed Mar 10 20:15:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 10 20:15:16 2021 +0000 |
| tree | 4ffce9d2e7ca22dd2ace1dc154f6ba2f43cf939c | |
| parent | 622a8e8e33d35f85f3a035d086dae590582a3c06 [diff] | |
| parent | fb7b9fd8c3bfa8555d70e2825a5e81530880aa26 [diff] |
Merge "Fix icon text size being calculated in DP instead of SP." into sc-dev am: fb7b9fd8c3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13827422 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie9eb2c2ca37242fcfe74e01c132cbf60bf883627
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index f2dd60e..2440854 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java
@@ -472,7 +472,7 @@ 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));