From: Xavier Ducrohet <xav@android.com>
Date: Fri, 24 Feb 2012 02:42:04 +0000 (-0800)
Subject: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/1221a3650c2f8db7115791d9e607cf8bd6d463ef?hp=67da63f5cde4713048487178b4c9e791e14e060e

am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
  Move the automatic namespace outside of the res namespace. do not merge.
---

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 3d6537a..f0c215e 100644
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -1019,6 +1019,11 @@ bool AaptGroupEntry::getUiModeTypeName(const char* name,
               (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
               | ResTable_config::UI_MODE_TYPE_TELEVISION;
         return true;
+    } else if (strcmp(name, "appliance") == 0) {
+      if (out) out->uiMode =
+              (out->uiMode&~ResTable_config::MASK_UI_MODE_TYPE)
+              | ResTable_config::UI_MODE_TYPE_APPLIANCE;
+        return true;
     }
 
     return false;