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

Change-Id: Ie0e233e22284b8ddd2dbb86204e042651b6dfae2
This commit is contained in:
Sunny Goyal committed 2015-12-11 14:18:16 -08:00
commit 38e7f28d3f
3 files changed
+58 -2

No files matched your search

+1 -1
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);