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

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

Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 

Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
parent 5186f094

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21389,6 +21389,7 @@ package android.util { 
    field public static final int DENSITY_MEDIUM = 160; // 0xa0

    field public static final int DENSITY_TV = 213; // 0xd5

    field public static final int DENSITY_XHIGH = 320; // 0x140

    field public static final int DENSITY_XXHIGH = 480; // 0x1e0

    field public float density;

    field public int densityDpi;

    field public int heightPixels;

core/java/android/app/ActivityManager.java

+6 −2
Original line number Diff line number Diff line
@@ -1457,7 +1457,9 @@ public class ActivityManager { 
            case DisplayMetrics.DENSITY_HIGH:

                return DisplayMetrics.DENSITY_XHIGH;

            case DisplayMetrics.DENSITY_XHIGH:

                return DisplayMetrics.DENSITY_MEDIUM * 2;

                return DisplayMetrics.DENSITY_XXHIGH;

            case DisplayMetrics.DENSITY_XXHIGH:

                return DisplayMetrics.DENSITY_XHIGH * 2;

            default:

                // The density is some abnormal value.  Return some other

                // abnormal value that is a reasonable scaling of it.
@@ -1491,7 +1493,9 @@ public class ActivityManager { 
            case DisplayMetrics.DENSITY_HIGH:

                return (size * DisplayMetrics.DENSITY_XHIGH) / DisplayMetrics.DENSITY_HIGH;

            case DisplayMetrics.DENSITY_XHIGH:

                return (size * DisplayMetrics.DENSITY_MEDIUM * 2) / DisplayMetrics.DENSITY_XHIGH;

                return (size * DisplayMetrics.DENSITY_XXHIGH) / DisplayMetrics.DENSITY_XHIGH;

            case DisplayMetrics.DENSITY_XXHIGH:

                return (size * DisplayMetrics.DENSITY_XHIGH*2) / DisplayMetrics.DENSITY_XXHIGH;

            default:

                // The density is some abnormal value.  Return some other

                // abnormal value that is a reasonable scaling of it.

core/java/android/util/DisplayMetrics.java

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,13 @@ public class DisplayMetrics { 
     */

    public static final int DENSITY_XHIGH = 320;



    /**

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

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

     * being scaled up to it should be sufficient for almost all cases.

     */

    public static final int DENSITY_XXHIGH = 480;



    /**

     * The reference density used throughout the system.

     */

include/utils/ResourceTypes.h

+2 −0
Original line number Diff line number Diff line
@@ -843,6 +843,8 @@ struct ResTable_config 
        DENSITY_MEDIUM = ACONFIGURATION_DENSITY_MEDIUM,

        DENSITY_TV = ACONFIGURATION_DENSITY_TV,

        DENSITY_HIGH = ACONFIGURATION_DENSITY_HIGH,

        DENSITY_XHIGH = ACONFIGURATION_DENSITY_XHIGH,

        DENSITY_XXHIGH = ACONFIGURATION_DENSITY_XXHIGH,

        DENSITY_NONE = ACONFIGURATION_DENSITY_NONE

    };

native/include/android/configuration.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ enum { 
    ACONFIGURATION_DENSITY_MEDIUM = 160,

    ACONFIGURATION_DENSITY_TV = 213,

    ACONFIGURATION_DENSITY_HIGH = 240,

    ACONFIGURATION_DENSITY_XHIGH = 320,

    ACONFIGURATION_DENSITY_XXHIGH = 480,

    ACONFIGURATION_DENSITY_NONE = 0xffff,



    ACONFIGURATION_KEYBOARD_ANY  = 0x0000,