diff options
| author | Adam Powell <adamp@google.com> | 2015-06-04 19:36:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 19:36:47 +0000 |
| commit | 2b710c29e2ae7808bbd1a1a6d0c39f69ad8bf33a (patch) | |
| tree | 83730e0caa178133f32ac62b6fded6206aa9fb21 /core/java | |
| parent | b2556363e7c142d7e0ab8f62e1a82662600a0821 (diff) | |
| parent | f6d9cd19e28d78fe3f46914959932ea1244b04ed (diff) | |
Merge "Add DENSITY_360" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/util/DisplayMetrics.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java index d0e5b9e5aa33..a36e66cce98f 100644 --- a/core/java/android/util/DisplayMetrics.java +++ b/core/java/android/util/DisplayMetrics.java @@ -79,6 +79,14 @@ public class DisplayMetrics { * This is not a density that applications should target, instead relying * on the system to scale their {@link #DENSITY_XXHIGH} assets for them. */ + public static final int DENSITY_360 = 360; + + /** + * Intermediate density for screens that sit somewhere between + * {@link #DENSITY_XHIGH} (320 dpi) and {@link #DENSITY_XXHIGH} (480 dpi). + * This is not a density that applications should target, instead relying + * on the system to scale their {@link #DENSITY_XXHIGH} assets for them. + */ public static final int DENSITY_400 = 400; /** |