summaryrefslogtreecommitdiff
path: root/tools/aapt/AaptAssets.cpp
diff options
context:
space:
mode:
author John Spurlock <jspurlock@google.com> 2014-04-04 19:34:11 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-04-04 19:34:11 +0000
commit0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec (patch)
treeee5502e236507ebf43a8b365bcf10466b49be61b /tools/aapt/AaptAssets.cpp
parentdd79334f7ecb39135058c2049cd933b4b930a3d1 (diff)
parent642421aa7f284817cc1a972a7f9c7a64696a0116 (diff)
am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '642421aa7f284817cc1a972a7f9c7a64696a0116': Introduce new UI_MODE_TYPE_WATCH and qualifier.
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 38bfa00d7564..e0dab785bc47 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -1342,6 +1342,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;