Merge "[2/n] Add DisplayMetrics.DENSITY_390 API" into main
diff --git a/core/api/current.txt b/core/api/current.txt
index 5310fdc..2ded810 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -49273,6 +49273,7 @@
field public static final int DENSITY_300 = 300; // 0x12c
field public static final int DENSITY_340 = 340; // 0x154
field public static final int DENSITY_360 = 360; // 0x168
+ field @FlaggedApi("com.android.window.flags.density_390_api") public static final int DENSITY_390 = 390; // 0x186
field public static final int DENSITY_400 = 400; // 0x190
field public static final int DENSITY_420 = 420; // 0x1a4
field public static final int DENSITY_440 = 440; // 0x1b8
diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
index 9148c4a..f14485b 100755
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -16,6 +16,9 @@
package android.util;
+import static com.android.window.flags.Flags.FLAG_DENSITY_390_API;
+
+import android.annotation.FlaggedApi;
import android.annotation.IntDef;
import android.annotation.Nullable;
import android.compat.annotation.UnsupportedAppUsage;
@@ -59,6 +62,7 @@
DENSITY_XHIGH,
DENSITY_340,
DENSITY_360,
+ DENSITY_390,
DENSITY_400,
DENSITY_420,
DENSITY_440,
@@ -182,6 +186,15 @@
* This is not a density that applications should target, instead relying
* on the system to scale their {@link #DENSITY_XXHIGH} assets for them.
*/
+ @FlaggedApi(FLAG_DENSITY_390_API)
+ public static final int DENSITY_390 = 390;
+
+ /**
+ * Intermediate density for screens that sit somewhere between
+ * {@link #DENSITY_XHIGH} (320 dpi) and {@link #DENSITY_XXHIGH} (480 dpi).
+ * This is not a density that applications should target, instead relying
+ * on the system to scale their {@link #DENSITY_XXHIGH} assets for them.
+ */
public static final int DENSITY_400 = 400;
/**