summaryrefslogtreecommitdiffstats
path: root/core/java/android/util
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-10-17 18:29:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-17 18:29:17 -0700
commit9039b9a7efd6d42e842de35d2246971e74753035 (patch)
tree26957bbc5166c6f9e07bb7c8edd3623bf4c376f2 /core/java/android/util
parent53caf87531372048d4171626e767eeeb94ec664c (diff)
parent63a16e0e0c4a9691a35f815d5422bdf0fa72efda (diff)
downloadframeworks_base-9039b9a7efd6d42e842de35d2246971e74753035.zip
frameworks_base-9039b9a7efd6d42e842de35d2246971e74753035.tar.gz
frameworks_base-9039b9a7efd6d42e842de35d2246971e74753035.tar.bz2
am 63a16e0e: am 6834ae69: Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev
* commit '63a16e0e0c4a9691a35f815d5422bdf0fa72efda': Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞...
Diffstat (limited to 'core/java/android/util')
-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 dae47b8..6cda905 100644
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -67,6 +67,14 @@ public class DisplayMetrics {
public static final int DENSITY_XHIGH = 320;
/**
+ * Intermediate density for screens that sit somewhere between
+ * {@link #DENSITY_XHIGH} (320dpi) 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;
+
+ /**
* Standard quantized DPI for extra-extra-high-density screens. Applications
* should not generally worry about this density; relying on XHIGH graphics
* being scaled up to it should be sufficient for almost all cases.