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

Commit e2c7715c authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of bbca8133 to master 

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
parents 6895c499 bbca8133

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6003,6 +6003,7 @@ package android.content.res { 
    field public static final int UI_MODE_TYPE_DESK = 2; // 0x2

    field public static final int UI_MODE_TYPE_MASK = 15; // 0xf

    field public static final int UI_MODE_TYPE_NORMAL = 1; // 0x1

    field public static final int UI_MODE_TYPE_TELEVISION = 4; // 0x4

    field public static final int UI_MODE_TYPE_UNDEFINED = 0; // 0x0

    field public float fontScale;

    field public int hardKeyboardHidden;

core/java/android/app/UiModeManager.java

+2 −1
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ public class UiModeManager { 
     * Return the current running mode type.  May be one of

     * {@link Configuration#UI_MODE_TYPE_NORMAL Configuration.UI_MODE_TYPE_NORMAL},

     * {@link Configuration#UI_MODE_TYPE_DESK Configuration.UI_MODE_TYPE_DESK}, or

     * {@link Configuration#UI_MODE_TYPE_CAR Configuration.UI_MODE_TYPE_CAR},

     * {@link Configuration#UI_MODE_TYPE_CAR Configuration.UI_MODE_TYPE_CAR}, or

     * {@link Configuration#UI_MODE_TYPE_TELEVISION Configuration.UI_MODE_TYPE_TV}.

     */

    public int getCurrentModeType() {

        if (mService != null) {

core/java/android/content/res/Configuration.java

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
    public static final int UI_MODE_TYPE_NORMAL = 0x01;

    public static final int UI_MODE_TYPE_DESK = 0x02;

    public static final int UI_MODE_TYPE_CAR = 0x03;

    public static final int UI_MODE_TYPE_TELEVISION = 0x04;



    public static final int UI_MODE_NIGHT_MASK = 0x30;

    public static final int UI_MODE_NIGHT_UNDEFINED = 0x00;
@@ -367,6 +368,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
            case UI_MODE_TYPE_NORMAL: /* normal is not interesting to print */ break;

            case UI_MODE_TYPE_DESK: sb.append(" desk"); break;

            case UI_MODE_TYPE_CAR: sb.append(" car"); break;

            case UI_MODE_TYPE_TELEVISION: sb.append(" television"); break;

            default: sb.append(" uimode="); sb.append(uiMode&UI_MODE_TYPE_MASK); break;

        }

        switch ((uiMode&UI_MODE_NIGHT_MASK)) {

include/utils/ResourceTypes.h

+1 −0
Original line number Diff line number Diff line
@@ -953,6 +953,7 @@ struct ResTable_config 
        UI_MODE_TYPE_NORMAL = ACONFIGURATION_UI_MODE_TYPE_NORMAL,

        UI_MODE_TYPE_DESK = ACONFIGURATION_UI_MODE_TYPE_DESK,

        UI_MODE_TYPE_CAR = ACONFIGURATION_UI_MODE_TYPE_CAR,

        UI_MODE_TYPE_TELEVISION = ACONFIGURATION_UI_MODE_TYPE_TELEVISION,



        // uiMode bits for the night switch.

        MASK_UI_MODE_NIGHT = 0x30,

native/include/android/configuration.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ enum { 
    ACONFIGURATION_UI_MODE_TYPE_NORMAL = 0x01,

    ACONFIGURATION_UI_MODE_TYPE_DESK = 0x02,

    ACONFIGURATION_UI_MODE_TYPE_CAR = 0x03,

    ACONFIGURATION_UI_MODE_TYPE_TELEVISION = 0x04,



    ACONFIGURATION_UI_MODE_NIGHT_ANY = 0x00,

    ACONFIGURATION_UI_MODE_NIGHT_NO = 0x1,