diff options
| author | 2012-02-13 13:53:39 -0800 | |
|---|---|---|
| committer | 2012-03-05 14:51:35 -0800 | |
| commit | 5e7bb1e675df2cc1edd9808afcaaeed07830bd9f (patch) | |
| tree | ef274bee6ea7f09c1233220f2c650e0c17fe1ed8 /tools | |
| parent | e6a0ec60607783b426b92f638055c79178fdd892 (diff) | |
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 7900ab7aea6d..3d6537a9013e 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/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++; |