diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-19 20:28:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-19 20:28:49 -0700 |
| commit | 469b4c67adc77a87eb2c9ed9217edf1778002828 (patch) | |
| tree | f6ca01c85c85a27ecd6f54ae1193f30e1cc67501 /tools/aapt | |
| parent | b933dc7f47ec9a9609d0775fc469849f066bfcd7 (diff) | |
| parent | aad0fcc9619eb72c18a6afff48ebc9d4011f0f54 (diff) | |
| download | frameworks_base-469b4c67adc77a87eb2c9ed9217edf1778002828.zip frameworks_base-469b4c67adc77a87eb2c9ed9217edf1778002828.tar.gz frameworks_base-469b4c67adc77a87eb2c9ed9217edf1778002828.tar.bz2 | |
am aad0fcc9: Merge change 7783 into donut
Merge commit 'aad0fcc9619eb72c18a6afff48ebc9d4011f0f54'
* commit 'aad0fcc9619eb72c18a6afff48ebc9d4011f0f54':
Add "nodpi" density, and expose a bunch of density-related APIs.
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 67af116..14cad2f 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -654,9 +654,15 @@ bool AaptGroupEntry::getDensityName(const char* name, ResTable_config* out) { if (strcmp(name, kWildcardName) == 0) { - if (out) out->density = 0; + if (out) out->density = ResTable_config::DENSITY_DEFAULT; return true; } + + if (strcmp(name, "nodpi") == 0) { + if (out) out->density = ResTable_config::DENSITY_NONE; + return true; + } + char* c = (char*)name; while (*c >= '0' && *c <= '9') { c++; |