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

Merge "Add DENSITY_140, DENSITY_180, DENSITY_200, DENSITY_220" into qt-dev

Browse Source 
am: 151f5b2ec8

Change-Id: I2e3aa5e7d34a89af2090f0cd55a51ad2e439ab61
This commit is contained in:
Harry Slatyer
2019-04-15 16:55:33 -07:00
committed by android-build-merger
parent 9b8835363c 151f5b2ec8
commit 0786074f6b
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -47820,6 +47820,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_140 = 140; // 0x8c
field public static final int DENSITY_180 = 180; // 0xb4
field public static final int DENSITY_200 = 200; // 0xc8
field public static final int DENSITY_220 = 220; // 0xdc
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

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

@@ -33,11 +33,32 @@ public class DisplayMetrics {
*/
public static final int DENSITY_LOW = 120;
/**
* Intermediate density for screens that sit between {@link #DENSITY_LOW} (120dpi) and
* {@link #DENSITY_MEDIUM} (160dpi). This is not a density that applications should target,
* instead relying on the system to scale their {@link #DENSITY_MEDIUM} assets for them.
*/
public static final int DENSITY_140 = 140;
/**
* Standard quantized DPI for medium-density screens.
*/
public static final int DENSITY_MEDIUM = 160;
/**
* Intermediate density for screens that sit between {@link #DENSITY_MEDIUM} (160dpi) and
* {@link #DENSITY_HIGH} (240dpi). This is not a density that applications should target,
* instead relying on the system to scale their {@link #DENSITY_HIGH} assets for them.
*/
public static final int DENSITY_180 = 180;
/**
* Intermediate density for screens that sit between {@link #DENSITY_MEDIUM} (160dpi) and
* {@link #DENSITY_HIGH} (240dpi). This is not a density that applications should target,
* instead relying on the system to scale their {@link #DENSITY_HIGH} assets for them.
*/
public static final int DENSITY_200 = 200;
/**
* This is a secondary density, added for some common screen configurations.
* It is recommended that applications not generally target this as a first
@@ -57,6 +78,13 @@ public class DisplayMetrics {
*/
public static final int DENSITY_TV = 213;
/**
* Intermediate density for screens that sit between {@link #DENSITY_MEDIUM} (160dpi) and
* {@link #DENSITY_HIGH} (240dpi). This is not a density that applications should target,
* instead relying on the system to scale their {@link #DENSITY_HIGH} assets for them.
*/
public static final int DENSITY_220 = 220;
/**
* Standard quantized DPI for high-density screens.
*/