From: Dianne Hackborn <hackbod@google.com>
Date: Mon, 23 May 2011 23:16:54 +0000 (-0700)
Subject: am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/3b663f23c9c168a06b534802d8f5e4d28589b8ab?hp=57eb8d8693135a33a186fad3a4c854b5c13337fb

am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2

* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9':
  Add "television" mode.
---

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 75535f8..4894196 100644
--- a/AaptAssets.cpp
+++ b/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;