diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-12 00:37:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-12 00:37:25 +0000 |
| commit | ea5ce4080be58a8092df38a49d828e4281497dc4 (patch) | |
| tree | d045090782b85d09f3f8ae675084743d7f5fde38 | |
| parent | ceada4fd80a7502b0057cf683661b2ea65a2652d (diff) | |
| parent | 15f704e70a0fc02f50f0b618b19147ca09c5e421 (diff) | |
| download | frameworks_base-ea5ce4080be58a8092df38a49d828e4281497dc4.zip frameworks_base-ea5ce4080be58a8092df38a49d828e4281497dc4.tar.gz frameworks_base-ea5ce4080be58a8092df38a49d828e4281497dc4.tar.bz2 | |
am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev
* commit '15f704e70a0fc02f50f0b618b19147ca09c5e421':
Fix issue #23122445: Add 420 density
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/util/DisplayMetrics.java | 8 |
3 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 4b36adc..cb63aaa 100644 --- a/api/current.txt +++ b/api/current.txt @@ -33958,6 +33958,7 @@ package android.util { field public static final int DENSITY_280 = 280; // 0x118 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_560 = 560; // 0x230 field public static final int DENSITY_DEFAULT = 160; // 0xa0 field public static final int DENSITY_HIGH = 240; // 0xf0 diff --git a/api/system-current.txt b/api/system-current.txt index 36cd869..a9bc944 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -36250,6 +36250,7 @@ package android.util { field public static final int DENSITY_280 = 280; // 0x118 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_560 = 560; // 0x230 field public static final int DENSITY_DEFAULT = 160; // 0xa0 field public static final int DENSITY_HIGH = 240; // 0xf0 diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java index a36e66c..9a69600 100644 --- a/core/java/android/util/DisplayMetrics.java +++ b/core/java/android/util/DisplayMetrics.java @@ -90,6 +90,14 @@ public class DisplayMetrics { public static final int DENSITY_400 = 400; /** + * 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_420 = 420; + + /** * Standard quantized DPI for extra-extra-high-density screens. */ public static final int DENSITY_XXHIGH = 480; |