diff options
| author | Zak Cohen <zakcohen@google.com> | 2016-12-12 15:21:21 -0800 |
|---|---|---|
| committer | Zak Cohen <zakcohen@google.com> | 2017-01-11 11:44:47 -0800 |
| commit | 1a6acdbb86c3e72bdb0a4dcab3bda58cbc4ea34c (patch) | |
| tree | 1b243f434a14a25dc0eb39097293c3f27b74a54a /core | |
| parent | 3c6f28aa5968b1edb823495efa15e7358de5261e (diff) | |
Introduce new UI_MODE_TYPE_VR_HEADSET and qualifier.
Bug: 30989383
Test: Unit test for aapt2
Change-Id: I66dc65af6327b94fed74538bee08cada0b8be4fa
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/UiModeManager.java | 5 | ||||
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 12 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 1 |
3 files changed, 15 insertions, 3 deletions
diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java index 2e2172919dbc..2572a2021e24 100644 --- a/core/java/android/app/UiModeManager.java +++ b/core/java/android/app/UiModeManager.java @@ -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) { diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 227dc91cf108..d44af7fe47a0 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -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; } diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 89581bbb3ac4..db157bf9cbf3 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -755,6 +755,7 @@ 4 UI_MODE_TYPE_TELEVISION 5 UI_MODE_TYPE_APPLIANCE 6 UI_MODE_TYPE_WATCH + 7 UI_MODE_TYPE_VR_HEADSET Any other values will have surprising consequences. --> <integer name="config_defaultUiModeType">1</integer> |