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>
This commit is contained in:
@@ -805,9 +805,9 @@ public class DeviceProfile {
|
|||||||
allAppsCellWidthPx = pxFromDp(inv.allAppsCellSize[mTypeIndex].x, mMetrics, scale);
|
allAppsCellWidthPx = pxFromDp(inv.allAppsCellSize[mTypeIndex].x, mMetrics, scale);
|
||||||
if (isScalableGrid) {
|
if (isScalableGrid) {
|
||||||
allAppsIconSizePx =
|
allAppsIconSizePx =
|
||||||
pxFromDp(inv.allAppsIconSize[mTypeIndex], mMetrics);
|
pxFromDp(inv.allAppsIconSize[mTypeIndex], mMetrics, scale);
|
||||||
allAppsIconTextSizePx =
|
allAppsIconTextSizePx =
|
||||||
pxFromSp(inv.allAppsIconTextSize[mTypeIndex], mMetrics);
|
pxFromSp(inv.allAppsIconTextSize[mTypeIndex], mMetrics, scale);
|
||||||
allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
|
allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;
|
||||||
} else {
|
} else {
|
||||||
float invIconSizeDp = inv.allAppsIconSize[mTypeIndex];
|
float invIconSizeDp = inv.allAppsIconSize[mTypeIndex];
|
||||||
|
|||||||
Reference in New Issue
Block a user