commit afafb7d144fbced4675720d5f8c53a02e1ee27a8
author android-build-team Robot <android-build-team-robot@google.com> Fri Jul 17 01:20:26 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jul 17 01:20:26 2020 +0000
tree 6ddf1869f7ee68812cf2e087c0dcc40026940eaf
parent 621ef1e226d3627ab7c2ae90de6247487896765a
parent 8127f132310b9850379bf3856b8c8c3ac032ab45

Snap for 6687127 from 8127f132310b9850379bf3856b8c8c3ac032ab45 to rvc-release

Change-Id: I90d2e38f6364ed5125c27ce472cc4118e3e4dd49

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;