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

Commit e37ee119 authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by Android (Google) Code Review
Browse files

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

parents aac4febc 178bba45

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -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

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -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

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -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

core/java/android/util/DisplayMetrics.java

+22 −0
Original line number Diff line number Diff line
@@ -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).