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

Commit 75a3f8f1 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev 

* commit '15f704e7':
  Fix issue #23122445: Add 420 density
parents b2a979a3 15f704e7

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -33958,6 +33958,7 @@ package android.util { 
    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_420 = 420; // 0x1a4

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

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

    field public static final int DENSITY_HIGH = 240; // 0xf0

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36250,6 +36250,7 @@ package android.util { 
    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_420 = 420; // 0x1a4

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

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

    field public static final int DENSITY_HIGH = 240; // 0xf0

core/java/android/util/DisplayMetrics.java

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

    public static final int DENSITY_400 = 400;



    /**

     * 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_420 = 420;



    /**

     * Standard quantized DPI for extra-extra-high-density screens.

     */