commit 36a1600d6679b4fcd7345a275f5c8699501c91ed
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jul 13 21:44:57 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 13 21:44:57 2020 +0000
tree ff4e352ade9c6e95cbdd34fa2083c7d31cb6401b
parent 5491b2e2e0615b8773007395548881dba693f6fd
parent 3535944395c5932c2c1968851375d121c5507bd3

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

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index e3cd0bd..49caa93 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -369,8 +369,10 @@
         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;