summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-04-03 16:37:27 -0400
committerJohn Spurlock <jspurlock@google.com>2014-04-04 15:21:53 -0400
commit6c191299a73388cd593809c0b66bafbd08fd2982 (patch)
tree86466cc5d46bb13d87ae71c906349957edd3a7fb /tools
parent8db6d9af58b9b81dbd764acd3f6a379afb539bf6 (diff)
downloadframeworks_base-6c191299a73388cd593809c0b66bafbd08fd2982.zip
frameworks_base-6c191299a73388cd593809c0b66bafbd08fd2982.tar.gz
frameworks_base-6c191299a73388cd593809c0b66bafbd08fd2982.tar.bz2
Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH. Bug:13395758 Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
Diffstat (limited to 'tools')
-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 62200d9..729a048 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;