diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-10 17:52:01 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-10 17:52:01 -0800 |
| commit | 258797318a99eb1ad4019f9863c69e34ef47a1ff (patch) | |
| tree | e30e0905d16880d946c6ffac20cd8246adc82fe5 /src/com/android/launcher3/DeviceProfile.java | |
| parent | aefc0c4dd0589d2ef423caf26c11068b5cb59722 (diff) | |
| parent | 49750ce75e7413ad3c4fe4be31a2e1d73312794b (diff) | |
| download | android_packages_apps_Trebuchet-258797318a99eb1ad4019f9863c69e34ef47a1ff.tar.gz android_packages_apps_Trebuchet-258797318a99eb1ad4019f9863c69e34ef47a1ff.tar.bz2 android_packages_apps_Trebuchet-258797318a99eb1ad4019f9863c69e34ef47a1ff.zip | |
Merge "Fixing All apps not respecting scaled icon size" into ub-launcher3-burnaby-polish
am: 49750ce75e
* commit '49750ce75e7413ad3c4fe4be31a2e1d73312794b':
Fixing All apps not respecting scaled icon size
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 5032dcf19..ef1cf73eb 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); |