diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-06-06 12:10:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-06 12:10:05 -0700 |
| commit | 168585ed68f03ddc851cd734cbb6ba813e30eb85 (patch) | |
| tree | f48591a6feb0e60c3da8400098fc9a961af48d9d /tools/aapt/AaptAssets.cpp | |
| parent | 9c4ed1394bb16b1d76758127a9b5d73bd363adaf (diff) | |
| parent | 5474902fe9fe72c825855c4a77f99a581a9f6594 (diff) | |
| download | frameworks_base-168585ed68f03ddc851cd734cbb6ba813e30eb85.zip frameworks_base-168585ed68f03ddc851cd734cbb6ba813e30eb85.tar.gz frameworks_base-168585ed68f03ddc851cd734cbb6ba813e30eb85.tar.bz2 | |
am 5474902f: Merge "xhdpi" into froyo
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken
* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
xhdpi
Diffstat (limited to 'tools/aapt/AaptAssets.cpp')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 4d2d046..d6cfb12 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -893,6 +893,11 @@ bool AaptGroupEntry::getDensityName(const char* name, return true; } + if (strcmp(name, "xhdpi") == 0) { + if (out) out->density = ResTable_config::DENSITY_MEDIUM*2; + return true; + } + char* c = (char*)name; while (*c >= '0' && *c <= '9') { c++; |