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

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

Merge "Add DENSITY_360" into mnc-dev

parents b2556363 f6d9cd19

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34002,6 +34002,7 @@ package android.util { 
    method public void setTo(android.util.DisplayMetrics);

    method public void setToDefaults();

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

    field public static final int DENSITY_360 = 360; // 0x168

    field public static final int DENSITY_400 = 400; // 0x190

    field public static final int DENSITY_560 = 560; // 0x230

    field public static final int DENSITY_DEFAULT = 160; // 0xa0

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36267,6 +36267,7 @@ package android.util { 
    method public void setTo(android.util.DisplayMetrics);

    method public void setToDefaults();

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

    field public static final int DENSITY_360 = 360; // 0x168

    field public static final int DENSITY_400 = 400; // 0x190

    field public static final int DENSITY_560 = 560; // 0x230

    field public static final int DENSITY_DEFAULT = 160; // 0xa0

core/java/android/util/DisplayMetrics.java

+8 −0
Original line number Diff line number Diff line
@@ -73,6 +73,14 @@ public class DisplayMetrics { 
     */

    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_360 = 360;



    /**

     * Intermediate density for screens that sit somewhere between

     * {@link #DENSITY_XHIGH} (320 dpi) and {@link #DENSITY_XXHIGH} (480 dpi).