From b67bfa7512092d38cb7e29851148cebaf4b0387f Mon Sep 17 00:00:00 2001 From: Thales Lima Date: Wed, 2 Nov 2022 15:30:11 +0000 Subject: [PATCH] Create test for default grid Fixes: 256044695 Test: DeviceDefaultGridTest Change-Id: Ie0a4de12f777ad3d15020252b2f67b575cc0eca9 --- src/com/android/launcher3/InvariantDeviceProfile.java | 5 +++++ src/com/android/launcher3/Utilities.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 0c6f340cb1..ca92aa48f6 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -324,6 +324,11 @@ public class InvariantDeviceProfile { return displayOption.grid.name; } + @VisibleForTesting + public static String getDefaultGridName(Context context) { + return new InvariantDeviceProfile().initGrid(context, null); + } + private void initGrid(Context context, Info displayInfo, DisplayOption displayOption, @DeviceType int deviceType) { DisplayMetrics metrics = context.getResources().getDisplayMetrics(); diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index f70511af7b..a5075327d0 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -521,6 +521,11 @@ public final class Utilities { return (int) (dp * Resources.getSystem().getDisplayMetrics().density); } + /** Converts a dp value to pixels for a certain density. */ + public static int dpToPx(float dp, int densityDpi) { + float densityRatio = (float) densityDpi / DisplayMetrics.DENSITY_DEFAULT; + return (int) (dp * densityRatio); + } public static int pxFromSp(float size, DisplayMetrics metrics) { return pxFromSp(size, metrics, 1f);