diff options
Diffstat (limited to 'src/com/android/launcher3/InvariantDeviceProfile.java')
| -rw-r--r-- | src/com/android/launcher3/InvariantDeviceProfile.java | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index d22461535..d7bebd1b1 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -76,6 +76,7 @@ public class InvariantDeviceProfile { public int numFolderRows; public int numFolderColumns; public float iconSize; + public float landscapeIconSize; public int iconBitmapSize; public int fillResIconDpi; public float iconTextSize; @@ -84,8 +85,6 @@ public class InvariantDeviceProfile { * Number of icons inside the hotseat area. */ public int numHotseatIcons; - float hotseatIconSize; - public float hotseatScale; int defaultLayoutId; public DeviceProfile landscapeProfile; @@ -99,12 +98,12 @@ public class InvariantDeviceProfile { public InvariantDeviceProfile(InvariantDeviceProfile p) { this(p.name, p.minWidthDps, p.minHeightDps, p.numRows, p.numColumns, p.numFolderRows, p.numFolderColumns, p.minAllAppsPredictionColumns, - p.iconSize, p.iconTextSize, p.numHotseatIcons, p.hotseatIconSize, + p.iconSize, p.landscapeIconSize, p.iconTextSize, p.numHotseatIcons, p.defaultLayoutId); } InvariantDeviceProfile(String n, float w, float h, int r, int c, int fr, int fc, int maapc, - float is, float its, int hs, float his, int dlId) { + float is, float lis, float its, int hs, int dlId) { name = n; minWidthDps = w; minHeightDps = h; @@ -114,12 +113,10 @@ public class InvariantDeviceProfile { numFolderColumns = fc; minAllAppsPredictionColumns = maapc; iconSize = is; + landscapeIconSize = lis; iconTextSize = its; numHotseatIcons = hs; - hotseatIconSize = his; defaultLayoutId = dlId; - - hotseatScale = hotseatIconSize / iconSize; } @TargetApi(23) @@ -152,17 +149,15 @@ public class InvariantDeviceProfile { minAllAppsPredictionColumns = closestProfile.minAllAppsPredictionColumns; iconSize = interpolatedDeviceProfileOut.iconSize; + landscapeIconSize = interpolatedDeviceProfileOut.landscapeIconSize; iconBitmapSize = Utilities.pxFromDp(iconSize, dm); iconTextSize = interpolatedDeviceProfileOut.iconTextSize; - hotseatIconSize = interpolatedDeviceProfileOut.hotseatIconSize; fillResIconDpi = getLauncherIconDensity(iconBitmapSize); // If the partner customization apk contains any grid overrides, apply them // Supported overrides: numRows, numColumns, iconSize applyPartnerDeviceProfileOverrides(context, dm); - hotseatScale = hotseatIconSize / iconSize; - Point realSize = new Point(); display.getRealSize(realSize); // The real size never changes. smallSide and largeSide will remain the @@ -210,9 +205,9 @@ public class InvariantDeviceProfile { a.getInt(R.styleable.InvariantDeviceProfile_numFolderColumns, numColumns), a.getInt(R.styleable.InvariantDeviceProfile_minAllAppsPredictionColumns, numColumns), iconSize, + a.getFloat(R.styleable.InvariantDeviceProfile_landscapeIconSize, iconSize), a.getFloat(R.styleable.InvariantDeviceProfile_iconTextSize, 0), a.getInt(R.styleable.InvariantDeviceProfile_numHotseatIcons, numColumns), - a.getFloat(R.styleable.InvariantDeviceProfile_hotseatIconSize, iconSize), a.getResourceId(R.styleable.InvariantDeviceProfile_defaultLayoutId, 0))); a.recycle(); } @@ -304,14 +299,14 @@ public class InvariantDeviceProfile { private void add(InvariantDeviceProfile p) { iconSize += p.iconSize; + landscapeIconSize += p.landscapeIconSize; iconTextSize += p.iconTextSize; - hotseatIconSize += p.hotseatIconSize; } private InvariantDeviceProfile multiply(float w) { iconSize *= w; + landscapeIconSize *= w; iconTextSize *= w; - hotseatIconSize *= w; return this; } |