aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 09:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of a50a419b82 to ub-launcher3-master.

Browse Source 
Change-Id: Ie0e233e22284b8ddd2dbb86204e042651b6dfae2
This commit is contained in:
Sunny Goyal
2015-12-11 14:18:16 -08:00
parent 258797318a a50a419b82
commit 38e7f28d3f
3 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/DeviceProfile.java
View File

@@ -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);