commit 2b710c29e2ae7808bbd1a1a6d0c39f69ad8bf33a
author Adam Powell <adamp@google.com> Thu Jun 04 19:36:39 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 04 19:36:47 2015 +0000
tree 83730e0caa178133f32ac62b6fded6206aa9fb21
parent b2556363e7c142d7e0ab8f62e1a82662600a0821
parent f6d9cd19e28d78fe3f46914959932ea1244b04ed

Merge "Add DENSITY_360" into mnc-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index c9a8efb..0467b69 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -34002,6 +34002,7 @@
     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_360 = 360; // 0x168
     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

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 2f26891..d11fe85 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -36267,6 +36267,7 @@
     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_360 = 360; // 0x168
     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

core/java/android/util/DisplayMetrics.java

diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
index d0e5b9e..a36e66c 100644
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -79,6 +79,14 @@
      * 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;
 
     /**