diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-10 12:28:21 -0800 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2017-05-27 00:15:18 +0200 |
| commit | 284667730dd0a640cd3dba4935f8fc0e7204032b (patch) | |
| tree | eacb0498a3af5e656162b63712a6515948c19b1e | |
| parent | 14d0937792d73ee890a14ff45e11c5d552b722fc (diff) | |
| download | android_packages_apps_Trebuchet-284667730dd0a640cd3dba4935f8fc0e7204032b.tar.gz android_packages_apps_Trebuchet-284667730dd0a640cd3dba4935f8fc0e7204032b.tar.bz2 android_packages_apps_Trebuchet-284667730dd0a640cd3dba4935f8fc0e7204032b.zip | |
Fixing All apps not respecting scaled icon size
Change-Id: I3d05c713939fd69d04f5896cdc5db91480b0d4d1
| -rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 2 | ||||
| -rw-r--r-- | 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 1fc0473fe..63bb15ba4 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -118,7 +118,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 51c634d4f..e0d2234cf 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -92,7 +92,7 @@ public class DeviceProfile { public int allAppsNumPredictiveCols; public int allAppsButtonVisualSize; public final int allAppsIconSizePx; - public final int allAppsIconTextSizePx; + public final float allAppsIconTextSizeSp; // QSB public boolean searchBarVisible; @@ -142,7 +142,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); @@ -205,7 +205,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); |