summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-08-12 00:34:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-12 00:34:56 +0000
commit15f704e70a0fc02f50f0b618b19147ca09c5e421 (patch)
treecaa9efd97df680fc74d72f0f040f6388d96453b7 /core
parente43d43c391a5b531aead1eae0156a66a3d924fd1 (diff)
parent1e9c51a00aeb8c0bc6be170a4615cf2959c4f032 (diff)
downloadframeworks_base-15f704e70a0fc02f50f0b618b19147ca09c5e421.zip
frameworks_base-15f704e70a0fc02f50f0b618b19147ca09c5e421.tar.gz
frameworks_base-15f704e70a0fc02f50f0b618b19147ca09c5e421.tar.bz2
Merge "Fix issue #23122445: Add 420 density" into mnc-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/util/DisplayMetrics.java8
1 files changed, 8 insertions, 0 deletions
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;