Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5b15bb0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Calculate all apps cell height based on actual sizes." into rvc-dev am: 8127f132 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12152234

Change-Id: Ice2867481c5d761ef955e74671e950f89f48ea6f
parents 8d7fdfdd 8127f132

src/com/android/launcher3/DeviceProfile.java

+3 −1
Original line number Diff line number Diff line
@@ -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;