commit cd9cffe63d8a4c785ef174465c16bed9a2533c3d
author Brandon Dayauon <brdayauon@google.com> Thu May 26 16:40:57 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 26 16:40:57 2022 +0000
tree 7d34201b3ba3f8705f60c9d2cb8bd6a50a00fd67
parent 8738a8ace7cb01269f314a685ce547e6d78d76dd
parent 5ba5c76c769c0653d8614473767c331c4d48b7ab

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

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

Change-Id: I6a941af90c0305da211c410d74b6e674d10ee0a7
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 212c3b0..4e00a05 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];