diff options
| author | Ramanan Rajeswaran <ramanan@google.com> | 2012-02-13 14:24:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-13 14:24:38 -0800 |
| commit | 352b8d03c63585f4eaec09d2e39a4d173be83164 (patch) | |
| tree | 072a3165db1da70212e7e696049754c944096728 /tools | |
| parent | 5f5ea91f60b4b7d2fcf3da3603cd745a53cba48f (diff) | |
| parent | 8046e294c545b8e3712bff7925b024639936d5bf (diff) | |
| download | frameworks_base-352b8d03c63585f4eaec09d2e39a4d173be83164.zip frameworks_base-352b8d03c63585f4eaec09d2e39a4d173be83164.tar.gz frameworks_base-352b8d03c63585f4eaec09d2e39a4d173be83164.tar.bz2 | |
am 8046e294: Merge "DO NOT MERGE" into ics-scoop
* commit '8046e294c545b8e3712bff7925b024639936d5bf':
DO NOT MERGE
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++; |