Merge "Calculate all apps cell height based on actual sizes." into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-07-15 23:32:58 +00:00
committed by Android (Google) Code Review

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;