summaryrefslogtreecommitdiffstats
path: root/core/java/android/util
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-10-17 18:27:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-17 18:27:25 -0700
commit63a16e0e0c4a9691a35f815d5422bdf0fa72efda (patch)
treeef957c4476233d14e14d2c647cb89318b0b607c7 /core/java/android/util
parent0149127198f9fc46a3a4f0b7f4e9579b72273b46 (diff)
parent6834ae6922625d2001eeb4f73f7fcd0df3a71f3c (diff)
downloadframeworks_base-63a16e0e0c4a9691a35f815d5422bdf0fa72efda.zip
frameworks_base-63a16e0e0c4a9691a35f815d5422bdf0fa72efda.tar.gz
frameworks_base-63a16e0e0c4a9691a35f815d5422bdf0fa72efda.tar.bz2
am 6834ae69: Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev
* commit '6834ae6922625d2001eeb4f73f7fcd0df3a71f3c': 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.