DO NOT MERGE

Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 7900ab7aea6d2407edd602bf0194982549c0c5f7..3d6537a9013e41725bbeb4cfe2cca31a353973dc 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -1079,17 +1079,12 @@ 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_XHIGH;
+        if (out) out->density = ResTable_config::DENSITY_MEDIUM*2;
         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++;