diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-15 23:32:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-15 23:32:58 +0000 |
commit | 8127f132310b9850379bf3856b8c8c3ac032ab45 (patch) | |
tree | 6ddf1869f7ee68812cf2e087c0dcc40026940eaf | |
parent | d481c5c58c489fb8339ddc4e9a872230e6d563b2 (diff) | |
parent | f06e1b8b93aaa7f7c80c423997e2b2ba862f3b86 (diff) | |
download | Launcher3-8127f132310b9850379bf3856b8c8c3ac032ab45.tar.gz |
Merge "Calculate all apps cell height based on actual sizes." into rvc-devandroid11-dev
-rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 4 |
1 files changed, 3 insertions, 1 deletions
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; |