summaryrefslogtreecommitdiffstats
path: root/libs/utils
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-07-21 17:46:02 -0700
committerDianne Hackborn <hackbod@google.com>2009-07-21 18:28:42 -0700
commit60cde60e89373b03f1c645c51f825c7898f62d9e (patch)
tree11203fd1998828f47f97f07de1114a0f54790a39 /libs/utils
parent0e09083649e526196637b5763532418278e10de8 (diff)
downloadframeworks_native-60cde60e89373b03f1c645c51f825c7898f62d9e.zip
frameworks_native-60cde60e89373b03f1c645c51f825c7898f62d9e.tar.gz
frameworks_native-60cde60e89373b03f1c645c51f825c7898f62d9e.tar.bz2
First pass at reworking screen density/size APIs.
This changes the names of the directories in aapt, to what you see in the list of DpiTest resources. Also adds a new "long" configuration for wide screens, which the platform sets appropriate, and introduces a new kind of resizeability for not large but significantly larger than normal screens which may have compatibility issues.
Diffstat (limited to 'libs/utils')
-rw-r--r--libs/utils/ResourceTypes.cpp7
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) {