diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-11 14:18:16 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-12-11 14:18:16 -0800 |
| commit | 38e7f28d3faa04fa0bc0f15e78f59a2b1ed123a3 (patch) | |
| tree | 006db9005dd42d767edfced129550b37d7e87690 /src/com/android/launcher3/DeviceProfile.java | |
| parent | 258797318a99eb1ad4019f9863c69e34ef47a1ff (diff) | |
| parent | a50a419b824c10f11d12097215982c978f740e00 (diff) | |
| download | android_packages_apps_Trebuchet-38e7f28d3faa04fa0bc0f15e78f59a2b1ed123a3.tar.gz android_packages_apps_Trebuchet-38e7f28d3faa04fa0bc0f15e78f59a2b1ed123a3.tar.bz2 android_packages_apps_Trebuchet-38e7f28d3faa04fa0bc0f15e78f59a2b1ed123a3.zip | |
resolve merge conflicts of a50a419b82 to ub-launcher3-master.
Change-Id: Ie0e233e22284b8ddd2dbb86204e042651b6dfae2
Diffstat (limited to 'src/com/android/launcher3/DeviceProfile.java')
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index ef1cf73eb..8538a1f4d 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -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.pxFromDp(inv.iconTextSize, dm) * scale); + iconTextSizePx = (int) (Utilities.pxFromSp(inv.iconTextSize, dm) * scale); iconDrawablePaddingPx = drawablePadding; hotseatIconSizePx = (int) (Utilities.pxFromDp(inv.hotseatIconSize, dm) * scale); |