1 files changed, 21 insertions, 5 deletions

diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
index 80da0b2..d58eec4 100644
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -79,10 +79,19 @@ public class DisplayMetrics {
     public static final int DENSITY_DEFAULT = DENSITY_MEDIUM;
 
     /**
+     * Scaling factor to convert a density in DPI units to the density scale.
+     * @hide
+     */
+    public static final float DENSITY_DEFAULT_SCALE = 1.0f / DENSITY_DEFAULT;
+
+    /**
      * The device's density.
-     * @hide becase eventually this should be able to change while
+     * @hide because eventually this should be able to change while
      * running, so shouldn't be a constant.
+     * @deprecated There is no longer a static density; you can find the
+     * density for a display in {@link #densityDpi}.
      */
+    @Deprecated
     public static final int DENSITY_DEVICE = getDeviceDensity();
 
     /**
@@ -150,6 +159,12 @@ public class DisplayMetrics {
      */
     public float noncompatDensity;
     /**
+     * The reported display density prior to any compatibility mode scaling
+     * being applied.
+     * @hide
+     */
+    public int noncompatDensityDpi;
+    /**
      * The reported scaled density prior to any compatibility mode scaling
      * being applied.
      * @hide
@@ -182,6 +197,7 @@ public class DisplayMetrics {
         noncompatWidthPixels = o.noncompatWidthPixels;
         noncompatHeightPixels = o.noncompatHeightPixels;
         noncompatDensity = o.noncompatDensity;
+        noncompatDensityDpi = o.noncompatDensityDpi;
         noncompatScaledDensity = o.noncompatScaledDensity;
         noncompatXdpi = o.noncompatXdpi;
         noncompatYdpi = o.noncompatYdpi;
@@ -190,11 +206,11 @@ public class DisplayMetrics {
     public void setToDefaults() {
         widthPixels = 0;
         heightPixels = 0;
-        density = DENSITY_DEVICE / (float) DENSITY_DEFAULT;
-        densityDpi = DENSITY_DEVICE;
+        density = noncompatDensity = DENSITY_DEVICE / (float) DENSITY_DEFAULT;
+        densityDpi = noncompatDensityDpi = DENSITY_DEVICE;
         scaledDensity = density;
-        xdpi = DENSITY_DEVICE;
-        ydpi = DENSITY_DEVICE;
+        xdpi = noncompatXdpi = DENSITY_DEVICE;
+        ydpi = noncompatYdpi = DENSITY_DEVICE;
         noncompatWidthPixels = 0;
         noncompatHeightPixels = 0;
     }