summaryrefslogtreecommitdiff
path: root/tools/aapt/AaptAssets.cpp
diff options
context:
space:
mode:
author John Spurlock <jspurlock@google.com> 2014-04-04 19:24:09 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-04-04 19:24:09 +0000
commit5c31e487c4577e1c47ee7c949325d6a13f0d462e (patch)
tree3ea98382d7d3cafd8f6af4fad749111dedc7b48b /tools/aapt/AaptAssets.cpp
parentd10b65431547d66b41e4e282e9261453bb0658ff (diff)
parent6c191299a73388cd593809c0b66bafbd08fd2982 (diff)
Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
Diffstat (limited to 'tools/aapt/AaptAssets.cpp')
-rw-r--r--tools/aapt/AaptAssets.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 62200d91996a..729a048be56c 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -1117,6 +1117,11 @@ bool AaptGroupEntry::getUiModeTypeName(const char* name,
(out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
| ResTable_config::UI_MODE_TYPE_APPLIANCE;
return true;
+ } else if (strcmp(name, "watch") == 0) {
+ if (out) out->uiMode =
+ (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
+ | ResTable_config::UI_MODE_TYPE_WATCH;
+ return true;
}
return false;