diff options
| author | Adam Powell <adamp@google.com> | 2015-02-11 13:34:43 -0800 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2015-02-11 13:34:43 -0800 |
| commit | f6d4045d6c386fe09eafb894aa1ff79ca6f04178 (patch) | |
| tree | 8b124cb40778c99cc04e6c96c66721113303c1b6 | |
| parent | d7310bd1499c0b48594a8fbbcbe0c7e80c1e5832 (diff) | |
| download | frameworks_base-f6d4045d6c386fe09eafb894aa1ff79ca6f04178.zip frameworks_base-f6d4045d6c386fe09eafb894aa1ff79ca6f04178.tar.gz frameworks_base-f6d4045d6c386fe09eafb894aa1ff79ca6f04178.tar.bz2 | |
Add DENSITY_280
Bug 19350604
Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
| -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 d84b1dc..1ec77b1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33666,6 +33666,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; |