diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-24 11:27:11 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-05-24 11:27:11 -0700 |
| commit | e2c7715c772d5121397591b532d04a31b3ffcc99 (patch) | |
| tree | a528b89349ba2b367aeae8b442b5c696a7c8c99e /tools | |
| parent | 6895c4994350bc10a06481ecf42c4ba8abb3eedb (diff) | |
| parent | bbca81334e3603c7328dc526bd63032b23d5261d (diff) | |
| download | frameworks_base-e2c7715c772d5121397591b532d04a31b3ffcc99.zip frameworks_base-e2c7715c772d5121397591b532d04a31b3ffcc99.tar.gz frameworks_base-e2c7715c772d5121397591b532d04a31b3ffcc99.tar.bz2 | |
resolved conflicts for merge of bbca8133 to master
Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
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 75535f8..4894196 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; |