diff options
| author | Ramanan Rajeswaran <ramanan@google.com> | 2012-02-13 13:53:39 -0800 |
|---|---|---|
| committer | Ramanan Rajeswaran <ramanan@google.com> | 2012-02-13 14:17:06 -0800 |
| commit | 9d29031417bd2256a287969271edcd57c0cbd9c2 (patch) | |
| tree | d9d42b81f6517ff31dac52ef185a152302e493c5 /tools | |
| parent | c1496d2d9a496e4aba817a58ecb9e07fe55cdba5 (diff) | |
| download | frameworks_base-9d29031417bd2256a287969271edcd57c0cbd9c2.zip frameworks_base-9d29031417bd2256a287969271edcd57c0cbd9c2.tar.gz frameworks_base-9d29031417bd2256a287969271edcd57c0cbd9c2.tar.bz2 | |
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 7900ab7..3d6537a 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++; |