summaryrefslogtreecommitdiff
path: root/tools/aapt/AaptAssets.cpp
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2011-05-23 16:16:54 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-05-23 16:16:54 -0700
commitbbca81334e3603c7328dc526bd63032b23d5261d (patch)
treec29dd1ed7c2119cd50bbc4e56be9ee36d89891c7 /tools/aapt/AaptAssets.cpp
parent98a8231e838d7d624c5862d81d1975ef4f8d0d57 (diff)
parent4bb78889d04594c01a6af7f6d38c1764e9f575f9 (diff)
am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9': Add "television" mode.
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 75535f8bfee6..48941961ccb9 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -913,6 +913,11 @@ bool AaptGroupEntry::getUiModeTypeName(const char* name,
(out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
| ResTable_config::UI_MODE_TYPE_CAR;
return true;
+ } else if (strcmp(name, "television") == 0) {
+ if (out) out->uiMode =
+ (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
+ | ResTable_config::UI_MODE_TYPE_TELEVISION;
+ return true;
}
return false;