am 63a16e0e: am 6834ae69: Merge "Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞..." into klp-dev

* commit '63a16e0e0c4a9691a35f815d5422bdf0fa72efda':
  Fix issue #11256132: Add density bucket for all real numbers between 0 and ∞...
This commit is contained in:
Dianne Hackborn
2013-10-17 18:29:17 -07:00
committed by Android Git Automerger
2 changed files with 9 additions and 0 deletions

View File

@@ -25794,6 +25794,7 @@ package android.util {
method public boolean equals(android.util.DisplayMetrics);
method public void setTo(android.util.DisplayMetrics);
method public void setToDefaults();
field public static final int DENSITY_400 = 400; // 0x190
field public static final int DENSITY_DEFAULT = 160; // 0xa0
field public static final int DENSITY_HIGH = 240; // 0xf0
field public static final int DENSITY_LOW = 120; // 0x78

View File

@@ -66,6 +66,14 @@ public class DisplayMetrics {
*/
public static final int DENSITY_XHIGH = 320;
/**
* Intermediate density for screens that sit somewhere between
* {@link #DENSITY_XHIGH} (320dpi) 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;
/**
* Standard quantized DPI for extra-extra-high-density screens. Applications
* should not generally worry about this density; relying on XHIGH graphics