summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Nowell <pnowell@google.com>2014-09-26 15:00:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-26 15:00:22 +0000
commit31a141af13a77ff095c1e1c61644ccd5e051dec2 (patch)
tree6a16a239b9e7e436dc7b4d05fd5ba9e86e1aa75a
parent759962ab6dd6937b25668e874ce56e0ef9389832 (diff)
parentd561913798c6ee3c987f39fa19f70e53eeb93ce6 (diff)
downloadframeworks_base-31a141af13a77ff095c1e1c61644ccd5e051dec2.zip
frameworks_base-31a141af13a77ff095c1e1c61644ccd5e051dec2.tar.gz
frameworks_base-31a141af13a77ff095c1e1c61644ccd5e051dec2.tar.bz2
Merge "Corrects a typo that identified XXXHIGH as 560 dpi instead of 640." into lmp-dev
-rw-r--r--core/java/android/util/DisplayMetrics.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
index 946a3f7..c855e57 100644
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -81,7 +81,7 @@ public class DisplayMetrics {
/**
* Intermediate density for screens that sit somewhere between
- * {@link #DENSITY_XXHIGH} (480 dpi) and {@link #DENSITY_XXXHIGH} (560 dpi).
+ * {@link #DENSITY_XXHIGH} (480 dpi) and {@link #DENSITY_XXXHIGH} (640 dpi).
* This is not a density that applications should target, instead relying
* on the system to scale their {@link #DENSITY_XXXHIGH} assets for them.
*/