From 383e0a29ec44e8fed15f09c91fe39d58ca21e185 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 10 Dec 2015 12:28:21 -0800 Subject: [PATCH] Fixing All apps not respecting scaled icon size Change-Id: I3d05c713939fd69d04f5896cdc5db91480b0d4d1 --- src/com/android/launcher3/BubbleTextView.java | 2 +- src/com/android/launcher3/DeviceProfile.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index c8f5a4594..f6c9e3c77 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -113,7 +113,7 @@ public class BubbleTextView extends TextView if (display == DISPLAY_WORKSPACE) { setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx); } else if (display == DISPLAY_ALL_APPS) { - setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx); + setTextSize(TypedValue.COMPLEX_UNIT_SP, grid.allAppsIconTextSizeSp); defaultIconSize = grid.allAppsIconSizePx; } diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index ccbfba178..dd9c6e116 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -98,7 +98,7 @@ public class DeviceProfile { public int allAppsNumPredictiveCols; public int allAppsButtonVisualSize; public final int allAppsIconSizePx; - public final int allAppsIconTextSizePx; + public final float allAppsIconTextSizeSp; // QSB private int searchBarWidgetInternalPaddingTop, searchBarWidgetInternalPaddingBottom; @@ -150,7 +150,7 @@ public class DeviceProfile { res.getDimensionPixelSize(R.dimen.dynamic_grid_icon_drawable_padding); // AllApps uses the original non-scaled icon text size - allAppsIconTextSizePx = Utilities.pxFromDp(inv.iconTextSize, dm); + allAppsIconTextSizeSp = inv.iconTextSize; // AllApps uses the original non-scaled icon size allAppsIconSizePx = Utilities.pxFromDp(inv.iconSize, dm); @@ -203,7 +203,7 @@ public class DeviceProfile { private void updateIconSize(float scale, int drawablePadding, Resources res, DisplayMetrics dm) { iconSizePx = (int) (Utilities.pxFromDp(inv.iconSize, dm) * scale); - iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, dm) * scale); + iconTextSizePx = (int) (Utilities.pxFromDp(inv.iconTextSize, dm) * scale); iconDrawablePaddingPx = drawablePadding; hotseatIconSizePx = (int) (Utilities.pxFromDp(inv.hotseatIconSize, dm) * scale); -- 2.11.0