diff options
| author | Adam Powell <adamp@google.com> | 2015-02-12 02:08:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-12 02:08:04 +0000 |
| commit | 0ec652cf72bd8b7f619462f172ac0152d4d6c83d (patch) | |
| tree | 971cd0603979336924aa707913389398d1fa0414 | |
| parent | 3292c0e2640667e5ef78896653a41c85e7de06c5 (diff) | |
| parent | f6d4045d6c386fe09eafb894aa1ff79ca6f04178 (diff) | |
| download | base-0ec652cf72bd8b7f619462f172ac0152d4d6c83d.tar.gz | |
Merge "Add DENSITY_280" into lmp-mr1-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/util/DisplayMetrics.java | 7 |
3 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 3e11cda0903c..144f2923b757 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31435,6 +31435,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_280 = 280; // 0x118 field public static final int DENSITY_400 = 400; // 0x190 field public static final int DENSITY_560 = 560; // 0x230 field public static final int DENSITY_DEFAULT = 160; // 0xa0 diff --git a/api/system-current.txt b/api/system-current.txt index 8d24e838105e..ca783e12ac48 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33668,6 +33668,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_280 = 280; // 0x118 field public static final int DENSITY_400 = 400; // 0x190 field public static final int DENSITY_560 = 560; // 0x230 field public static final int DENSITY_DEFAULT = 160; // 0xa0 diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java index c855e579650b..d0e5b9e5aa33 100644 --- a/core/java/android/util/DisplayMetrics.java +++ b/core/java/android/util/DisplayMetrics.java @@ -62,6 +62,13 @@ public class DisplayMetrics { public static final int DENSITY_HIGH = 240; /** + * Intermediate density for screens that sit between {@link #DENSITY_HIGH} (240dpi) and + * {@link #DENSITY_XHIGH} (320dpi). This is not a density that applications should target, + * instead relying on the system to scale their {@link #DENSITY_XHIGH} assets for them. + */ + public static final int DENSITY_280 = 280; + + /** * Standard quantized DPI for extra-high-density screens. */ public static final int DENSITY_XHIGH = 320; |