diff options
| author | 2018-02-03 01:37:33 +0000 | |
|---|---|---|
| committer | 2018-02-03 01:37:33 +0000 | |
| commit | 1d64dc96f7c1c77b1621e852f554fa28f6738604 (patch) | |
| tree | 3f466e80a46f6203190d0d87dbd97bae2420f9ee | |
| parent | 548284fb6d57213a4fe4db9370ddcf1d2a433a63 (diff) | |
| parent | a21fa41755feb1068d28e42094682cf71a07e5ae (diff) | |
Merge "Add DENSITY_440" am: 6c40bbdc5e
am: a21fa41755
Change-Id: I3024b00c5060d7f6055d1e2e60a36061a10bf0ad
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/util/DisplayMetrics.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index c6710d3c7944..e047bdc0ef61 100644 --- a/api/current.txt +++ b/api/current.txt @@ -44093,6 +44093,7 @@ package android.util { field public static final int DENSITY_360 = 360; // 0x168 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 field public static final int DENSITY_560 = 560; // 0x230 field public static final int DENSITY_DEFAULT = 160; // 0xa0 field public static final int DENSITY_DEVICE_STABLE; diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java index b7099b642e98..13de172c811c 100644 --- a/core/java/android/util/DisplayMetrics.java +++ b/core/java/android/util/DisplayMetrics.java @@ -120,6 +120,14 @@ public class DisplayMetrics { public static final int DENSITY_420 = 420; /** + * 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_440 = 440; + + /** * Standard quantized DPI for extra-extra-high-density screens. */ public static final int DENSITY_XXHIGH = 480; |