Merge "Add DENSITY_600" am: 8ac363088c
am: e79f44a393
Change-Id: I9a4cc11b8d45bafa5a4c25171c51b663b1091188
This commit is contained in:
1
api/current.txt
Normal file → Executable file
1
api/current.txt
Normal file → Executable file
@@ -45260,6 +45260,7 @@ package android.util {
|
||||
field public static final int DENSITY_420 = 420; // 0x1a4
|
||||
field public static final int DENSITY_440 = 440; // 0x1b8
|
||||
field public static final int DENSITY_560 = 560; // 0x230
|
||||
field public static final int DENSITY_600 = 600; // 0x258
|
||||
field public static final int DENSITY_DEFAULT = 160; // 0xa0
|
||||
field public static final int DENSITY_DEVICE_STABLE;
|
||||
field public static final int DENSITY_HIGH = 240; // 0xf0
|
||||
|
||||
8
core/java/android/util/DisplayMetrics.java
Normal file → Executable file
8
core/java/android/util/DisplayMetrics.java
Normal file → Executable file
@@ -141,6 +141,14 @@ public class DisplayMetrics {
|
||||
*/
|
||||
public static final int DENSITY_560 = 560;
|
||||
|
||||
/**
|
||||
* Intermediate density for screens that sit somewhere between
|
||||
* {@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.
|
||||
*/
|
||||
public static final int DENSITY_600 = 600;
|
||||
|
||||
/**
|
||||
* Standard quantized DPI for extra-extra-extra-high-density screens. Applications
|
||||
* should not generally worry about this density; relying on XHIGH graphics
|
||||
|
||||
Reference in New Issue
Block a user