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

Commit 9013325c authored by Zak Cohen's avatar Zak Cohen Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'vrmode' 

* changes:
  Set ui mode in UiModeManagerService to vrheadset when VR mode is enabled.
  Introduce new UI_MODE_TYPE_VR_HEADSET and qualifier.
parents e446c98b 1a70573a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10567,6 +10567,7 @@ package android.content.res { 
    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 static final int UI_MODE_TYPE_VR_HEADSET = 7; // 0x7

    field public static final int UI_MODE_TYPE_WATCH = 6; // 0x6

    field public int densityDpi;

    field public float fontScale;

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11071,6 +11071,7 @@ package android.content.res { 
    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 static final int UI_MODE_TYPE_VR_HEADSET = 7; // 0x7

    field public static final int UI_MODE_TYPE_WATCH = 6; // 0x6

    field public int densityDpi;

    field public float fontScale;

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10598,6 +10598,7 @@ package android.content.res { 
    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 static final int UI_MODE_TYPE_VR_HEADSET = 7; // 0x7

    field public static final int UI_MODE_TYPE_WATCH = 6; // 0x6

    field public int densityDpi;

    field public float fontScale;

core/java/android/app/UiModeManager.java

+3 −2
Original line number Diff line number Diff line
@@ -194,8 +194,9 @@ public class UiModeManager { 
     * {@link Configuration#UI_MODE_TYPE_DESK Configuration.UI_MODE_TYPE_DESK},

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

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

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

     * {@link Configuration#UI_MODE_TYPE_WATCH Configuration.UI_MODE_TYPE_WATCH}.

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

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

     * {@link Configuration#UI_MODE_TYPE_VR_HEADSET Configuration.UI_MODE_TYPE_VR_HEADSET}.

     */

    public int getCurrentModeType() {

        if (mService != null) {

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

+11 −1
Original line number Diff line number Diff line
@@ -552,6 +552,11 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
     * <a href="{@docRoot}guide/topics/resources/providing-resources.html#UiModeQualifier">watch</a>

     * resource qualifier. */

    public static final int UI_MODE_TYPE_WATCH = 0x06;

    /** Constant for {@link #uiMode}: a {@link #UI_MODE_TYPE_MASK}

     * value that corresponds to the

     * <a href="{@docRoot}guide/topics/resources/providing-resources.html#UiModeQualifier">vrheadset</a>

     * resource qualifier. */

    public static final int UI_MODE_TYPE_VR_HEADSET = 0x07;



    /** Constant for {@link #uiMode}: bits that encode the night mode. */

    public static final int UI_MODE_NIGHT_MASK = 0x30;
@@ -575,7 +580,8 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
     * device. They may be one of {@link #UI_MODE_TYPE_UNDEFINED},

     * {@link #UI_MODE_TYPE_NORMAL}, {@link #UI_MODE_TYPE_DESK},

     * {@link #UI_MODE_TYPE_CAR}, {@link #UI_MODE_TYPE_TELEVISION},

     * {@link #UI_MODE_TYPE_APPLIANCE}, or {@link #UI_MODE_TYPE_WATCH}.

     * {@link #UI_MODE_TYPE_APPLIANCE}, {@link #UI_MODE_TYPE_WATCH},

     * or {@link #UI_MODE_TYPE_VR_HEADSET}.

     *

     * <p>The {@link #UI_MODE_NIGHT_MASK} defines whether the screen

     * is in a special mode. They may be one of {@link #UI_MODE_NIGHT_UNDEFINED},
@@ -869,6 +875,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
            case UI_MODE_TYPE_TELEVISION: sb.append(" television"); break;

            case UI_MODE_TYPE_APPLIANCE: sb.append(" appliance"); break;

            case UI_MODE_TYPE_WATCH: sb.append(" watch"); break;

            case UI_MODE_TYPE_VR_HEADSET: sb.append(" vrheadset"); break;

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

        }

        switch ((uiMode&UI_MODE_NIGHT_MASK)) {
@@ -1746,6 +1753,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
            case Configuration.UI_MODE_TYPE_WATCH:

                parts.add("watch");

                break;

            case Configuration.UI_MODE_TYPE_VR_HEADSET:

                parts.add("vrheadset");

                break;

            default:

                break;

        }