diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-21 19:03:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-21 19:03:53 -0700 |
| commit | 351b6f926e06355079669f170a97a729537932ed (patch) | |
| tree | 0d779cee2a916404e9c423eb337d4e38d78ab997 /libs/utils | |
| parent | 297bde4328124db768b90cd11e38d5e23ca152ba (diff) | |
| parent | 7a0847196cc33a0f1ee563d2009393c88c618b30 (diff) | |
| download | frameworks_native-351b6f926e06355079669f170a97a729537932ed.zip frameworks_native-351b6f926e06355079669f170a97a729537932ed.tar.gz frameworks_native-351b6f926e06355079669f170a97a729537932ed.tar.bz2 | |
am 9fc20b0e: Merge change 8126 into donut
Merge commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf'
* commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf':
First pass at reworking screen density/size APIs.
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/ResourceTypes.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/utils/ResourceTypes.cpp b/libs/utils/ResourceTypes.cpp index 98d450b..4dca8bd 100644 --- a/libs/utils/ResourceTypes.cpp +++ b/libs/utils/ResourceTypes.cpp @@ -4012,11 +4012,11 @@ void ResTable::print(bool inclValues) const if (dval == ResTable_config::DENSITY_DEFAULT) { strcpy(density, "def"); } else if (dval == ResTable_config::DENSITY_NONE) { - strcpy(density, "non"); + strcpy(density, "no"); } 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", + 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 sz=%d lng=%d\n", (int)configIndex, type->config.language[0] ? type->config.language[0] : '-', type->config.language[1] ? type->config.language[1] : '-', @@ -4030,7 +4030,8 @@ void ResTable::print(bool inclValues) const type->config.navigation, dtohs(type->config.screenWidth), dtohs(type->config.screenHeight), - type->config.screenLayout); + type->config.screenLayout&ResTable_config::MASK_SCREENSIZE, + type->config.screenLayout&ResTable_config::MASK_SCREENLONG); size_t entryCount = dtohl(type->entryCount); uint32_t entriesStart = dtohl(type->entriesStart); if ((entriesStart&0x3) != 0) { |