diff options
| author | 2013-10-18 01:24:57 +0000 | |
|---|---|---|
| committer | 2013-10-18 01:25:00 +0000 | |
| commit | 6834ae6922625d2001eeb4f73f7fcd0df3a71f3c (patch) | |
| tree | 4a70d33c870813228a8bba879b37076351b41ffe | |
| parent | 53cb242f39c9ccfee3381ff28625e74e365d29b7 (diff) | |
| parent | 09acb7ca897c9f49dd65b7173688e4ca63ca5dd3 (diff) | |
Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/util/DisplayMetrics.java | 8 |
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. |