From: Ramanan Rajeswaran Date: Mon, 13 Feb 2012 21:53:39 +0000 (-0800) Subject: DO NOT MERGE X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/8d382166e0f117a1967f51e1a7be00d9db23dc47 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 7900ab7..3d6537a 100644 --- 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++;