commit 039036693a595ea60a7a3bd18b200d162a3a31a9
author Brandon Dayauon <brdayauon@google.com> Thu May 26 17:12:55 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 26 17:12:55 2022 +0000
tree 038e38268e651476ba5e1be3f29ad40657b59574
parent aac2a1b9072b78814f0bbc20da460f57896583f4
parent cd9cffe63d8a4c785ef174465c16bed9a2533c3d

Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: cd9cffe63d

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

Change-Id: I9d35410f26d6e7ea42872e3029f51883aa65093e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 8a82aeb..b276397 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -805,9 +805,9 @@
         allAppsCellWidthPx = pxFromDp(inv.allAppsCellSize[mTypeIndex].x, mMetrics, scale);
         if (isScalableGrid) {
             allAppsIconSizePx =
-                    pxFromDp(inv.allAppsIconSize[mTypeIndex], mMetrics);
+                    pxFromDp(inv.allAppsIconSize[mTypeIndex], mMetrics, scale);
             allAppsIconTextSizePx =
-                    pxFromSp(inv.allAppsIconTextSize[mTypeIndex], mMetrics);
+                    pxFromSp(inv.allAppsIconTextSize[mTypeIndex], mMetrics, scale);
             allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
         } else {
             float invIconSizeDp = inv.allAppsIconSize[mTypeIndex];