am ea5ce408: am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev

* commit 'ea5ce4080be58a8092df38a49d828e4281497dc4':
  Fix issue #23122445: Add 420 density
This commit is contained in:
Dianne Hackborn
2015-08-12 00:44:12 +00:00
committed by Android Git Automerger
3 changed files with 10 additions and 0 deletions

View File

@@ -33958,6 +33958,7 @@ package android.util {
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_420 = 420; // 0x1a4
field public static final int DENSITY_560 = 560; // 0x230
field public static final int DENSITY_DEFAULT = 160; // 0xa0
field public static final int DENSITY_HIGH = 240; // 0xf0

View File

@@ -36260,6 +36260,7 @@ package android.util {
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_420 = 420; // 0x1a4
field public static final int DENSITY_560 = 560; // 0x230
field public static final int DENSITY_DEFAULT = 160; // 0xa0
field public static final int DENSITY_HIGH = 240; // 0xf0

View File

@@ -89,6 +89,14 @@ public class DisplayMetrics {
*/
public static final int DENSITY_400 = 400;
/**
* 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_420 = 420;
/**
* Standard quantized DPI for extra-extra-high-density screens.
*/