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>
This commit is contained in:
Brandon Dayauon
2022-05-26 17:12:55 +00:00
committed by Automerger Merge Worker
+2 -2
View File
@@ -805,9 +805,9 @@ public class DeviceProfile {
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];