Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 637c8b30f92710f5bc1fe5b92c614ad3d92bd93c..7900ab7aea6d2407edd602bf0194982549c0c5f7 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -1079,12 +1079,17 @@ bool AaptGroupEntry::getDensityName(const char* name,
         if (out) out->density = ResTable_config::DENSITY_HIGH;
         return true;
     }
         if (out) out->density = ResTable_config::DENSITY_HIGH;
         return true;
     }

-    
+

     if (strcmp(name, "xhdpi") == 0) {
     if (strcmp(name, "xhdpi") == 0) {

-        if (out) out->density = ResTable_config::DENSITY_MEDIUM*2;
+        if (out) out->density = ResTable_config::DENSITY_XHIGH;

         return true;
     }
         return true;
     }

-    
+
+    if (strcmp(name, "xxhdpi") == 0) {
+        if (out) out->density = ResTable_config::DENSITY_XXHIGH;
+        return true;
+    }
+

     char* c = (char*)name;
     while (*c >= '0' && *c <= '9') {
         c++;
     char* c = (char*)name;
     while (*c >= '0' && *c <= '9') {
         c++;


@@ -2266,7 +2271,7 @@ status_t AaptAssets::filter(Bundle* bundle)
         return NO_ERROR;
     }
 
         return NO_ERROR;
     }
 

-    if (true || bundle->getVerbose()) {
+    if (bundle->getVerbose()) {

         if (!reqFilter.isEmpty()) {
             printf("Applying required filter: %s\n",
                     bundle->getConfigurations());
         if (!reqFilter.isEmpty()) {
             printf("Applying required filter: %s\n",
                     bundle->getConfigurations());