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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12152234 Change-Id: I88f54d5cf388aeacbf1da48e3e5f1e89f37ba836
2020-07-15 23:47:29 +00:00
parent c3771e64d9 8127f13231
commit e8e680005d
1 changed files with 3 additions and 1 deletions
@@ -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;