am c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 3d6537a9013e41725bbeb4cfe2cca31a353973dc..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 (strcmp(name, "xhdpi") == 0) {
-        if (out) out->density = ResTable_config::DENSITY_MEDIUM*2;
+        if (out) out->density = ResTable_config::DENSITY_XHIGH;
         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++;