Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23e4c3a8 authored by Harry Slatyer's avatar Harry Slatyer Committed by android-build-merger
Browse files

Merge "Add DENSITY_140, DENSITY_180, DENSITY_200, DENSITY_220" into qt-dev am: 151f5b2e 

am: 0786074f

Change-Id: Iac4bf3bf40ffcf4648710d837b1f1cabf06c4e6e
parents 4b614a50 0786074f

api/current.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -47820,6 +47820,10 @@ 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_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_260 = 260; // 0x104

    field public static final int DENSITY_280 = 280; // 0x118

    field public static final int DENSITY_280 = 280; // 0x118

    field public static final int DENSITY_300 = 300; // 0x12c

    field public static final int DENSITY_300 = 300; // 0x12c

core/java/android/util/DisplayMetrics.java

+28 −0
Original line number Original line Diff line number Diff line
@@ -33,11 +33,32 @@ public class DisplayMetrics { 
     */

     */

    public static final int DENSITY_LOW = 120;

    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.

     * Standard quantized DPI for medium-density screens.

     */

     */

    public static final int DENSITY_MEDIUM = 160;

    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.

     * This is a secondary density, added for some common screen configurations.

     * It is recommended that applications not generally target this as a first

     * 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;

    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.

     * Standard quantized DPI for high-density screens.

     */

     */