ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Expand support for different screen sizes.

Browse source 
Applications can now declare that they support small, normal, or
large screens.  Resource selection can also be done based on these
sizes.  By default, pre-Donut apps are false for small and large,
and Donut or later apps are assumed to support all sizes.  In either
case they can use <supports-screens> in their manifest to declare
what they actually support.
This commit is contained in:
Dianne Hackborn 2009-06-25 19:48:04 -07:00 • committed by Alex Ray
parent 35b4039b48
commit 8b72a9bb4e
2 changed files with 48 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
include/utils/ResourceTypes.h
View file

@ -866,7 +866,7 @@ struct ResTable_config
uint8_t keyboard;
uint8_t navigation;
uint8_t inputFlags;
uint8_t pad0;
uint8_t inputPad0;
};
uint32_t input;
};
@ -905,6 +905,23 @@ struct ResTable_config
uint32_t version;
};
enum {
SCREENLAYOUT_ANY = 0x0000,
SCREENLAYOUT_SMALL = 0x0001,
SCREENLAYOUT_NORMAL = 0x0002,
SCREENLAYOUT_LARGE = 0x0003,
};
union {
struct {
uint8_t screenLayout;
uint8_t screenConfigPad0;
uint8_t screenConfigPad1;
uint8_t screenConfigPad2;
};
uint32_t screenConfig;
};
inline void copyFromDeviceNoSwap(const ResTable_config& o) {
const size_t size = dtohl(o.size);
if (size >= sizeof(ResTable_config)) {
@ -950,6 +967,8 @@ struct ResTable_config
diff = (int32_t)(screenSize - o.screenSize);
if (diff != 0) return diff;
diff = (int32_t)(version - o.version);
if (diff != 0) return diff;
diff = (int32_t)(screenLayout - o.screenLayout);
return (int)diff;
}
@ -967,7 +986,8 @@ struct ResTable_config
CONFIG_ORIENTATION = 0x0080,
CONFIG_DENSITY = 0x0100,
CONFIG_SCREEN_SIZE = 0x0200,
CONFIG_VERSION = 0x0400
CONFIG_VERSION = 0x0400,
CONFIG_SCREEN_LAYOUT = 0x0800
};
// Compare two configuration, returning CONFIG_* flags set for each value
@ -985,6 +1005,7 @@ struct ResTable_config
if (navigation != o.navigation) diffs |= CONFIG_NAVIGATION;
if (screenSize != o.screenSize) diffs |= CONFIG_SCREEN_SIZE;
if (version != o.version) diffs |= CONFIG_VERSION;
if (screenLayout != o.screenLayout) diffs |= CONFIG_SCREEN_LAYOUT;
return diffs;
}
@ -1062,6 +1083,13 @@ struct ResTable_config
}
}
if (screenConfig || o.screenConfig) {
if (screenLayout != o.screenLayout) {
if (!screenLayout) return false;
if (!o.screenLayout) return true;
}
}
if (version || o.version) {
if (sdkVersion != o.sdkVersion) {
if (!sdkVersion) return false;
@ -1191,6 +1219,12 @@ struct ResTable_config
}
}
if (screenConfig || o.screenConfig) {
if ((screenLayout != o.screenLayout) && requested->screenLayout) {
return (screenLayout);
}
}
if (version || o.version) {
if ((sdkVersion != o.sdkVersion) && requested->sdkVersion) {
return (sdkVersion);
@ -1282,6 +1316,12 @@ struct ResTable_config
return false;
}
}
if (screenConfig != 0) {
if (settings.screenLayout != 0 && screenLayout != 0
&& screenLayout != settings.screenLayout) {
return false;
}
}
if (version != 0) {
if (settings.sdkVersion != 0 && sdkVersion != 0
&& sdkVersion != settings.sdkVersion) {
@ -1310,13 +1350,13 @@ struct ResTable_config
String8 toString() const {
char buf[200];
sprintf(buf, "imsi=%d/%d lang=%c%c reg=%c%c orient=0x%02x touch=0x%02x dens=0x%02x "
"kbd=0x%02x nav=0x%02x input=0x%02x screenW=0x%04x screenH=0x%04x vers=%d.%d",
sprintf(buf, "imsi=%d/%d lang=%c%c reg=%c%c orient=%d touch=%d dens=%d "
"kbd=%d nav=%d input=%d scrnW=%d scrnH=%d layout=%d vers=%d.%d",
mcc, mnc,
language[0] ? language[0] : '-', language[1] ? language[1] : '-',
country[0] ? country[0] : '-', country[1] ? country[1] : '-',
orientation, touchscreen, density, keyboard, navigation, inputFlags,
screenWidth, screenHeight, sdkVersion, minorVersion);
screenWidth, screenHeight, screenLayout, sdkVersion, minorVersion);
return String8(buf);
}
};

5
libs/utils/ResourceTypes.cpp
View file

@ -3919,7 +3919,7 @@ 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\n",
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",
(int)configIndex,
type->config.language[0] ? type->config.language[0] : '-',
type->config.language[1] ? type->config.language[1] : '-',
@ -3932,7 +3932,8 @@ void ResTable::print(bool inclValues) const
type->config.inputFlags,
type->config.navigation,
dtohs(type->config.screenWidth),
dtohs(type->config.screenHeight));
dtohs(type->config.screenHeight),
type->config.screenLayout);
size_t entryCount = dtohl(type->entryCount);
uint32_t entriesStart = dtohl(type->entriesStart);
if ((entriesStart&0x3) != 0) {