summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-10-17 17:28:09 -0700
committerThe Android Automerger <android-build@google.com>2013-10-18 14:48:55 -0700
commit413100d247ec9674b63b2175ecbafecb90a2df14 (patch)
tree7ef5c2c228c3044ec042e86ee4a45fbcba5f30f0
parentf4ca9e6101a86fc0119867aa0b792ade95a71ad2 (diff)
downloadbase-413100d247ec9674b63b2175ecbafecb90a2df14.tar.gz
Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞...
Well, how about 400. 400 is a real number. Change-Id: I29ac61b7d629d582c7b68367365a7f81fcf679a2
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/util/DisplayMetrics.java8
2 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index ff48db0efdbe..054f1cdd8b71 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25794,6 +25794,7 @@ package android.util {
method public boolean equals(android.util.DisplayMetrics);
method public void setTo(android.util.DisplayMetrics);
method public void setToDefaults();
+ field public static final int DENSITY_400 = 400; // 0x190
field public static final int DENSITY_DEFAULT = 160; // 0xa0
field public static final int DENSITY_HIGH = 240; // 0xf0
field public static final int DENSITY_LOW = 120; // 0x78
diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
index dae47b88c4e2..6cda90536c58 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.