drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev

Browse Source 
* commit '0ec652cf72bd8b7f619462f172ac0152d4d6c83d':
  Add DENSITY_280
This commit is contained in:
Adam Powell
2015-02-12 02:13:03 +00:00
committed by Android Git Automerger
parent 40bd8f416b 0ec652cf72
commit b73e029fea
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@ -31435,6 +31435,7 @@ package android.util {
method public boolean equals(android.util.DisplayMetrics); method public boolean equals(android.util.DisplayMetrics);
method public void setTo(android.util.DisplayMetrics); method public void setTo(android.util.DisplayMetrics);
method public void setToDefaults(); method public void setToDefaults();
field public static final int DENSITY_280 = 280; // 0x118
field public static final int DENSITY_400 = 400; // 0x190 field public static final int DENSITY_400 = 400; // 0x190
field public static final int DENSITY_560 = 560; // 0x230 field public static final int DENSITY_560 = 560; // 0x230
field public static final int DENSITY_DEFAULT = 160; // 0xa0 field public static final int DENSITY_DEFAULT = 160; // 0xa0

1
api/system-current.txt
View File

@ -33668,6 +33668,7 @@ package android.util {
method public boolean equals(android.util.DisplayMetrics); method public boolean equals(android.util.DisplayMetrics);
method public void setTo(android.util.DisplayMetrics); method public void setTo(android.util.DisplayMetrics);
method public void setToDefaults(); method public void setToDefaults();
field public static final int DENSITY_280 = 280; // 0x118
field public static final int DENSITY_400 = 400; // 0x190 field public static final int DENSITY_400 = 400; // 0x190
field public static final int DENSITY_560 = 560; // 0x230 field public static final int DENSITY_560 = 560; // 0x230
field public static final int DENSITY_DEFAULT = 160; // 0xa0 field public static final int DENSITY_DEFAULT = 160; // 0xa0

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

@ -61,6 +61,13 @@ public class DisplayMetrics {
*/ */
public static final int DENSITY_HIGH = 240; 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_280 = 280;
/** /**
* Standard quantized DPI for extra-high-density screens. * Standard quantized DPI for extra-high-density screens.
*/ */