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 /tools/aapt2/ConfigDescription.cpp | |
| 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 'tools/aapt2/ConfigDescription.cpp')
| -rw-r--r-- | tools/aapt2/ConfigDescription.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/aapt2/ConfigDescription.cpp b/tools/aapt2/ConfigDescription.cpp index 289919a39373..b1bd4012c1df 100644 --- a/tools/aapt2/ConfigDescription.cpp +++ b/tools/aapt2/ConfigDescription.cpp @@ -254,6 +254,11 @@ static bool parseUiModeType(const char* name, ResTable_config* out) { out->uiMode = (out->uiMode & ~ResTable_config::MASK_UI_MODE_TYPE) | ResTable_config::UI_MODE_TYPE_WATCH; return true; + } else if (strcmp(name, "vrheadset") == 0) { + if (out) + out->uiMode = (out->uiMode & ~ResTable_config::MASK_UI_MODE_TYPE) | + ResTable_config::UI_MODE_TYPE_VR_HEADSET; + return true; } return false; @@ -772,7 +777,10 @@ success: void ConfigDescription::ApplyVersionForCompatibility( ConfigDescription* config) { uint16_t min_sdk = 0; - if (config->screenLayout2 & ResTable_config::MASK_SCREENROUND) { + if ((config->uiMode & ResTable_config::MASK_UI_MODE_TYPE) + == ResTable_config::UI_MODE_TYPE_VR_HEADSET) { + min_sdk = SDK_O; + } else if (config->screenLayout2 & ResTable_config::MASK_SCREENROUND) { min_sdk = SDK_MARSHMALLOW; } else if (config->density == ResTable_config::DENSITY_ANY) { min_sdk = SDK_LOLLIPOP; |