diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-10 12:28:21 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-12-10 13:02:01 -0800 |
| commit | 383e0a29ec44e8fed15f09c91fe39d58ca21e185 (patch) | |
| tree | f484a405b1e9736c0d8a4e277dc3b64a36536974 /src/com/android/launcher3/DeviceProfile.java | |
| parent | 06538a778485e920a651bf662a90c6a5dc3b0218 (diff) | |
| download | android_packages_apps_Trebuchet-383e0a29ec44e8fed15f09c91fe39d58ca21e185.tar.gz android_packages_apps_Trebuchet-383e0a29ec44e8fed15f09c91fe39d58ca21e185.tar.bz2 android_packages_apps_Trebuchet-383e0a29ec44e8fed15f09c91fe39d58ca21e185.zip | |
Fixing All apps not respecting scaled icon size
Change-Id: I3d05c713939fd69d04f5896cdc5db91480b0d4d1
Diffstat (limited to 'src/com/android/launcher3/DeviceProfile.java')
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 6 |
1 files changed, 3 insertions, 3 deletions
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); |