]> git.saurik.com Git - android/aapt.git/commitdiff
am f8aea993: Make aapt ignore tools-related data.
authorXavier Ducrohet <xav@android.com>
Mon, 6 Feb 2012 19:41:37 +0000 (11:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Feb 2012 19:41:37 +0000 (11:41 -0800)
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
  Make aapt ignore tools-related data.

AaptAssets.cpp

index 3d6537a9013e41725bbeb4cfe2cca31a353973dc..f0c215eeffa5ce686d2059744a1ec047ba944793 100644 (file)
@@ -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;