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

Commit 298cce23 authored by st.ji's avatar st.ji Committed by android-build-merger
Browse files

Merge "Add DENSITY_600" am: 8ac36308 am: e79f44a3 

am: cd6e61cd

Change-Id: Ifa769017f525bbbfc8f2a94871e33aaaf0606407
parents 12fa2781 cd6e61cd

api/current.txt

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -45429,6 +45429,7 @@ package android.util { 
    field public static final int DENSITY_420 = 420; // 0x1a4

    field public static final int DENSITY_440 = 440; // 0x1b8

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

    field public static final int DENSITY_600 = 600; // 0x258

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

    field public static final int DENSITY_DEVICE_STABLE;

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

core/java/android/util/DisplayMetrics.java

100644 → 100755
+8 −0
Original line number Diff line number Diff line
@@ -141,6 +141,14 @@ public class DisplayMetrics { 
     */

    public static final int DENSITY_560 = 560;



    /**

     * Intermediate density for screens that sit somewhere between

     * {@link #DENSITY_XXHIGH} (480 dpi) and {@link #DENSITY_XXXHIGH} (640 dpi).

     * This is not a density that applications should target, instead relying

     * on the system to scale their {@link #DENSITY_XXXHIGH} assets for them.

     */

    public static final int DENSITY_600 = 600;



    /**

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

     * should not generally worry about this density; relying on XHIGH graphics