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 /libs/utils | |
| 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 'libs/utils')
| -rw-r--r-- | libs/utils/ResourceTypes.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libs/utils/ResourceTypes.cpp b/libs/utils/ResourceTypes.cpp index 87edb01..98d450b 100644 --- a/libs/utils/ResourceTypes.cpp +++ b/libs/utils/ResourceTypes.cpp @@ -4007,7 +4007,16 @@ void ResTable::print(bool inclValues) const printf(" NON-INTEGER ResTable_type ADDRESS: %p\n", type); continue; } - printf(" config %d lang=%c%c cnt=%c%c orien=%d touch=%d density=%d key=%d infl=%d nav=%d w=%d h=%d lyt=%d\n", + char density[16]; + uint16_t dval = dtohs(type->config.density); + if (dval == ResTable_config::DENSITY_DEFAULT) { + strcpy(density, "def"); + } else if (dval == ResTable_config::DENSITY_NONE) { + strcpy(density, "non"); + } else { + sprintf(density, "%d", (int)dval); + } + printf(" config %d lang=%c%c cnt=%c%c orien=%d touch=%d density=%s key=%d infl=%d nav=%d w=%d h=%d lyt=%d\n", (int)configIndex, type->config.language[0] ? type->config.language[0] : '-', type->config.language[1] ? type->config.language[1] : '-', @@ -4015,7 +4024,7 @@ void ResTable::print(bool inclValues) const type->config.country[1] ? type->config.country[1] : '-', type->config.orientation, type->config.touchscreen, - dtohs(type->config.density), + density, type->config.keyboard, type->config.inputFlags, type->config.navigation, |