diff options
| author | Adam Powell <adamp@google.com> | 2015-02-12 07:49:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-12 07:49:31 +0000 |
| commit | f4071c709d7f9b70ef840a61aaf2506a4a1db0a6 (patch) | |
| tree | 2365db0da435d79822f05ad25119571e8376759f /core/java/android/util | |
| parent | 683914bfb13908bf380a25258cd45bcf43f13dc9 (diff) | |
| parent | bee1def31bb7a3a22e7c83904a3d8c418eeb5e48 (diff) | |
| download | frameworks_base-f4071c709d7f9b70ef840a61aaf2506a4a1db0a6.zip frameworks_base-f4071c709d7f9b70ef840a61aaf2506a4a1db0a6.tar.gz frameworks_base-f4071c709d7f9b70ef840a61aaf2506a4a1db0a6.tar.bz2 | |
am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
automerge: bee1def
* commit 'bee1def31bb7a3a22e7c83904a3d8c418eeb5e48':
Add DENSITY_280
Diffstat (limited to 'core/java/android/util')
| -rw-r--r-- | core/java/android/util/DisplayMetrics.java | 7 |
1 files changed, 7 insertions, 0 deletions
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; |