From 1a6acdbb86c3e72bdb0a4dcab3bda58cbc4ea34c Mon Sep 17 00:00:00 2001 From: Zak Cohen Date: Mon, 12 Dec 2016 15:21:21 -0800 Subject: Introduce new UI_MODE_TYPE_VR_HEADSET and qualifier. Bug: 30989383 Test: Unit test for aapt2 Change-Id: I66dc65af6327b94fed74538bee08cada0b8be4fa --- tools/aapt2/ConfigDescription.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'tools/aapt2/ConfigDescription.cpp') 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; -- cgit v1.2.3-59-g8ed1b