Merge "Calculate all apps cell height based on actual sizes." into rvc-dev am: 8127f13231 am: e8e680005d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12152234

Change-Id: Idb2ccc0b50e0a382af642a2b244e079df458b32f
This commit is contained in:
TreeHugger Robot
2020-07-16 00:00:08 +00:00
committed by Automerger Merge Worker
+3 -1
View File
@@ -369,8 +369,10 @@ public class DeviceProfile {
if (allAppsHasDifferentNumColumns()) {
allAppsIconSizePx = ResourceUtils.pxFromDp(inv.allAppsIconSize, mInfo.metrics);
allAppsIconTextSizePx = Utilities.pxFromSp(inv.allAppsIconTextSize, mInfo.metrics);
allAppsCellHeightPx = getCellSize(inv.numAllAppsColumns, inv.numAllAppsColumns).y;
allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
// We use 4 below to ensure labels are closer to their corresponding icon.
allAppsCellHeightPx = Math.round(allAppsIconSizePx + allAppsIconTextSizePx
+ (4 * allAppsIconDrawablePaddingPx));
} else {
allAppsIconSizePx = iconSizePx;
allAppsIconTextSizePx = iconTextSizePx;