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

Commit 63b18d39 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 54cb63e2 to master"

parents 09b867ec 8a7d44e8

core/java/android/util/DisplayMetrics.java

+9 −0
Original line number Diff line number Diff line
@@ -37,6 +37,15 @@ public class DisplayMetrics { 
     */

    public static final int DENSITY_MEDIUM = 160;



    /**

     * Standard quantized DPI for 720p TV screens.  Applications should

     * generally not worry about this density, instead targeting

     * {@link #DENSITY_XHIGH} for 1080p TV screens.  For situations where

     * output is needed for a 720p screen, the UI elements can be scaled

     * automatically by the platform.

     */

    public static final int DENSITY_TV = 213;



    /**

     * Standard quantized DPI for high-density screens.

     */

include/utils/ResourceTypes.h

+1 −0
Original line number Diff line number Diff line
@@ -841,6 +841,7 @@ struct ResTable_config 
        DENSITY_DEFAULT = ACONFIGURATION_DENSITY_DEFAULT,

        DENSITY_LOW = ACONFIGURATION_DENSITY_LOW,

        DENSITY_MEDIUM = ACONFIGURATION_DENSITY_MEDIUM,

        DENSITY_TV = ACONFIGURATION_DENSITY_TV,

        DENSITY_HIGH = ACONFIGURATION_DENSITY_HIGH,

        DENSITY_NONE = ACONFIGURATION_DENSITY_NONE

    };

native/include/android/configuration.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ enum { 
    ACONFIGURATION_DENSITY_DEFAULT = 0,

    ACONFIGURATION_DENSITY_LOW = 120,

    ACONFIGURATION_DENSITY_MEDIUM = 160,

    ACONFIGURATION_DENSITY_TV = 213,

    ACONFIGURATION_DENSITY_HIGH = 240,

    ACONFIGURATION_DENSITY_NONE = 0xffff,

tools/aapt/AaptAssets.cpp

+5 −0
Original line number Diff line number Diff line
@@ -969,6 +969,11 @@ bool AaptGroupEntry::getDensityName(const char* name, 
        return true;

    }

    

    if (strcmp(name, "tvdpi") == 0) {

        if (out) out->density = ResTable_config::DENSITY_TV;

        return true;

    }

    

    if (strcmp(name, "hdpi") == 0) {

        if (out) out->density = ResTable_config::DENSITY_HIGH;

        return true;