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

Commit 0ec652cf authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Add DENSITY_280" into lmp-mr1-dev

parents 3292c0e2 f6d4045d

api/current.txt

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

api/system-current.txt

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

core/java/android/util/DisplayMetrics.java

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

     */

     */