diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-08 13:13:12 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-08 13:13:12 -0700 |
| commit | 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541 (patch) | |
| tree | c844365aa767f37da6081150dcf3caccb4fb6d46 /core/java/android/util/DisplayMetrics.java | |
| parent | 6bebbcd57b7b3ffad3af046f4899d885b30c828e (diff) | |
| parent | 3cf650dec40c0e40d613c76bd70453205af76ed8 (diff) | |
| download | frameworks_base-6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541.zip frameworks_base-6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541.tar.gz frameworks_base-6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'core/java/android/util/DisplayMetrics.java')
| -rw-r--r-- | core/java/android/util/DisplayMetrics.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java index 9de4cbe..095f4f4 100644 --- a/core/java/android/util/DisplayMetrics.java +++ b/core/java/android/util/DisplayMetrics.java @@ -31,7 +31,11 @@ public class DisplayMetrics { */ public static final int DEFAULT_DENSITY = 160; - private static final int sLcdDensity = SystemProperties.getInt("ro.sf.lcd_density", + /** + * The device's density. + * @hide + */ + public static final int DEVICE_DENSITY = SystemProperties.getInt("ro.sf.lcd_density", DEFAULT_DENSITY); /** @@ -90,9 +94,9 @@ public class DisplayMetrics { public void setToDefaults() { widthPixels = 0; heightPixels = 0; - density = sLcdDensity / (float) DEFAULT_DENSITY; + density = DEVICE_DENSITY / (float) DEFAULT_DENSITY; scaledDensity = density; - xdpi = sLcdDensity; - ydpi = sLcdDensity; + xdpi = DEVICE_DENSITY; + ydpi = DEVICE_DENSITY; } } |