commit 2561afac2d5004bfe6e628ecbb4563a020f45d2a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 16 00:00:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 16 00:00:08 2020 +0000
tree 28fe43f1d92df02ddf5557b17006df011bede53d
parent f0b6e2a6dad1cd16f77e7c08913a9df03c74ce21
parent e8e680005ded182b01baa52042503c067d79b2c3

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

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;