From f06e1b8b93aaa7f7c80c423997e2b2ba862f3b86 Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 9 Jul 2020 14:54:23 -0700
Subject: [PATCH] Calculate all apps cell height based on actual sizes.

This ensures that the cell contents always fit.

Bug: 160716074
Change-Id: I3d85adec3e7e3652fe4a258bd659382a3e696211
Merged-In: I3d85adec3e7e3652fe4a258bd659382a3e696211
(cherry picked from commit 3535944395c5932c2c1968851375d121c5507bd3)
---
 src/com/android/launcher3/DeviceProfile.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index e3cd0bd181..49caa93e61 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -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;