diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-06-04 16:33:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-04 16:33:48 -0700 |
| commit | 3cbef2cc21399f3729d4e0b96dccc58d594cac52 (patch) | |
| tree | 5ab4dbdbd2686937ce56e42dc45ba94b832e423d /tools | |
| parent | e7cce11edcb0e2315e6d65790b7effd9236d7dc5 (diff) | |
| parent | 5474902fe9fe72c825855c4a77f99a581a9f6594 (diff) | |
| download | frameworks_base-3cbef2cc21399f3729d4e0b96dccc58d594cac52.zip frameworks_base-3cbef2cc21399f3729d4e0b96dccc58d594cac52.tar.gz frameworks_base-3cbef2cc21399f3729d4e0b96dccc58d594cac52.tar.bz2 | |
am 5474902f: Merge "xhdpi" into froyo
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into froyo-plus-aosp
* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
xhdpi
Diffstat (limited to 'tools')
| -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 fc655a7..efc9619 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -888,6 +888,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++; |
