diff options
| author | Adam Powell <adamp@google.com> | 2015-02-12 02:34:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 02:34:42 +0000 |
| commit | bee1def31bb7a3a22e7c83904a3d8c418eeb5e48 (patch) | |
| tree | c8fa7039da22a7c01eeecd446cc4cf08cab51a90 /core/java/android/util | |
| parent | 3d576cc643497e5a4f0285dea75b7ba5e964009c (diff) | |
| parent | 97e0ba691222d037c1820ca8338ad13d07221daf (diff) | |
| download | frameworks_base-bee1def31bb7a3a22e7c83904a3d8c418eeb5e48.zip frameworks_base-bee1def31bb7a3a22e7c83904a3d8c418eeb5e48.tar.gz frameworks_base-bee1def31bb7a3a22e7c83904a3d8c418eeb5e48.tar.bz2 | |
am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
* commit '97e0ba691222d037c1820ca8338ad13d07221daf':
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; |