diff options
| author | John Spurlock <jspurlock@google.com> | 2014-04-04 19:28:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-04 19:28:09 +0000 |
| commit | 642421aa7f284817cc1a972a7f9c7a64696a0116 (patch) | |
| tree | e51a5b2c212bd95c4a052fcbd6b0bb0f0fce4976 /tools | |
| parent | 8f81d29558bb0c97187d5ae3a7ee696ec13b264a (diff) | |
| parent | 5c31e487c4577e1c47ee7c949325d6a13f0d462e (diff) | |
| download | frameworks_base-642421aa7f284817cc1a972a7f9c7a64696a0116.zip frameworks_base-642421aa7f284817cc1a972a7f9c7a64696a0116.tar.gz frameworks_base-642421aa7f284817cc1a972a7f9c7a64696a0116.tar.bz2 | |
am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
Introduce new UI_MODE_TYPE_WATCH and qualifier.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 5c11054..1f17316 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; |