diff options
| author | Adam Powell <adamp@google.com> | 2015-02-12 02:13:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 02:13:03 +0000 |
| commit | b73e029fea53fd5aeaf01ad7ba15560329d8de1c (patch) | |
| tree | 8e4672b9eb873e0da48661f1ee0fe661e04589fc | |
| parent | 40bd8f416b30b7b0eae244aa0c5aabd0be0d1c55 (diff) | |
| parent | 0ec652cf72bd8b7f619462f172ac0152d4d6c83d (diff) | |
| download | frameworks_base-b73e029fea53fd5aeaf01ad7ba15560329d8de1c.zip frameworks_base-b73e029fea53fd5aeaf01ad7ba15560329d8de1c.tar.gz frameworks_base-b73e029fea53fd5aeaf01ad7ba15560329d8de1c.tar.bz2 | |
am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
* commit '0ec652cf72bd8b7f619462f172ac0152d4d6c83d':
Add DENSITY_280
| -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 3e11cda..144f292 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 8d24e83..ca783e1 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 c855e57..d0e5b9e 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; |