Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Add DENSITY_260, DENSITY_300, DENSITY_340\" into nyc-mr1-dev

Browse Source 
am: e37ee119c2

Change-Id: Ida84134da4145843fa982abf1428790c692a24d6
This commit is contained in:
Erik Wolsheimer
2016-06-15 20:58:49 +00:00
committed by android-build-merger
parent 2d41ae0ee4 e37ee119c2
commit 4d4d4706ab
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

@@ -40272,7 +40272,10 @@ 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_260 = 260; // 0x104
field public static final int DENSITY_280 = 280; // 0x118
field public static final int DENSITY_300 = 300; // 0x12c
field public static final int DENSITY_340 = 340; // 0x154
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

3
api/system-current.txt
View File

@@ -43272,7 +43272,10 @@ 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_260 = 260; // 0x104
field public static final int DENSITY_280 = 280; // 0x118
field public static final int DENSITY_300 = 300; // 0x12c
field public static final int DENSITY_340 = 340; // 0x154
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

3
api/test-current.txt
View File

@@ -40352,7 +40352,10 @@ 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_260 = 260; // 0x104
field public static final int DENSITY_280 = 280; // 0x118
field public static final int DENSITY_300 = 300; // 0x12c
field public static final int DENSITY_340 = 340; // 0x154
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

22
core/java/android/util/DisplayMetrics.java
View File

@@ -61,6 +61,13 @@ public class DisplayMetrics {
*/
public static final int DENSITY_HIGH = 240;
/**
* Intermediate density for screens that sit between {@link #DENSITY_HIGH} (240dpi) and
* {@link #DENSITY_XHIGH} (320dpi). This is not a density that applications should target,
* instead relying on the system to scale their {@link #DENSITY_XHIGH} assets for them.
*/
public static final int DENSITY_260 = 260;
/**
* Intermediate density for screens that sit between {@link #DENSITY_HIGH} (240dpi) and
* {@link #DENSITY_XHIGH} (320dpi). This is not a density that applications should target,
@@ -68,11 +75,26 @@ public class DisplayMetrics {
*/
public static final int DENSITY_280 = 280;
/**
* Intermediate density for screens that sit between {@link #DENSITY_HIGH} (240dpi) and
* {@link #DENSITY_XHIGH} (320dpi). This is not a density that applications should target,
* instead relying on the system to scale their {@link #DENSITY_XHIGH} assets for them.
*/
public static final int DENSITY_300 = 300;
/**
* Standard quantized DPI for extra-high-density screens.
*/
public static final int DENSITY_XHIGH = 320;
/**
* 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_340 = 340;
/**
* Intermediate density for screens that sit somewhere between
* {@link #DENSITY_XHIGH} (320 dpi) and {@link #DENSITY_XXHIGH} (480 dpi).