ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of 06a8ceac to master

Browse Source 
Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69
This commit is contained in:
Dianne Hackborn 2011-05-19 21:44:52 -07:00
commit 79ba9b5e39
2 changed files with 90 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
include/utils/ResourceTypes.h
View File

@ -966,8 +966,7 @@ struct ResTable_config
struct { struct {
uint8_t screenLayout; uint8_t screenLayout;
uint8_t uiMode; uint8_t uiMode;
uint8_t screenConfigPad1; uint16_t smallestScreenWidthDp;
uint8_t screenConfigPad2;
}; };
uint32_t screenConfig; uint32_t screenConfig;
}; };
@ -1000,6 +999,7 @@ struct ResTable_config
screenHeight = dtohs(screenHeight); screenHeight = dtohs(screenHeight);
sdkVersion = dtohs(sdkVersion); sdkVersion = dtohs(sdkVersion);
minorVersion = dtohs(minorVersion); minorVersion = dtohs(minorVersion);
smallestScreenWidthDp = dtohs(smallestScreenWidthDp);
screenWidthDp = dtohs(screenWidthDp); screenWidthDp = dtohs(screenWidthDp);
screenHeightDp = dtohs(screenHeightDp); screenHeightDp = dtohs(screenHeightDp);
} }
@ -1013,6 +1013,7 @@ struct ResTable_config
screenHeight = htods(screenHeight); screenHeight = htods(screenHeight);
sdkVersion = htods(sdkVersion); sdkVersion = htods(sdkVersion);
minorVersion = htods(minorVersion); minorVersion = htods(minorVersion);
smallestScreenWidthDp = htods(smallestScreenWidthDp);
screenWidthDp = htods(screenWidthDp); screenWidthDp = htods(screenWidthDp);
screenHeightDp = htods(screenHeightDp); screenHeightDp = htods(screenHeightDp);
} }
@ -1034,6 +1035,8 @@ struct ResTable_config
if (diff != 0) return diff; if (diff != 0) return diff;
diff = (int32_t)(uiMode - o.uiMode); diff = (int32_t)(uiMode - o.uiMode);
if (diff != 0) return diff; if (diff != 0) return diff;
diff = (int32_t)(smallestScreenWidthDp - o.smallestScreenWidthDp);
if (diff != 0) return diff;
diff = (int32_t)(screenSizeDp - o.screenSizeDp); diff = (int32_t)(screenSizeDp - o.screenSizeDp);
return (int)diff; return (int)diff;
} }
@ -1052,6 +1055,7 @@ struct ResTable_config
CONFIG_ORIENTATION = ACONFIGURATION_ORIENTATION, CONFIG_ORIENTATION = ACONFIGURATION_ORIENTATION,
CONFIG_DENSITY = ACONFIGURATION_DENSITY, CONFIG_DENSITY = ACONFIGURATION_DENSITY,
CONFIG_SCREEN_SIZE = ACONFIGURATION_SCREEN_SIZE, CONFIG_SCREEN_SIZE = ACONFIGURATION_SCREEN_SIZE,
CONFIG_SMALLEST_SCREEN_SIZE = ACONFIGURATION_SMALLEST_SCREEN_SIZE,
CONFIG_VERSION = ACONFIGURATION_VERSION, CONFIG_VERSION = ACONFIGURATION_VERSION,
CONFIG_SCREEN_LAYOUT = ACONFIGURATION_SCREEN_LAYOUT, CONFIG_SCREEN_LAYOUT = ACONFIGURATION_SCREEN_LAYOUT,
CONFIG_UI_MODE = ACONFIGURATION_UI_MODE CONFIG_UI_MODE = ACONFIGURATION_UI_MODE
@ -1075,6 +1079,7 @@ struct ResTable_config
if (version != o.version) diffs |= CONFIG_VERSION; if (version != o.version) diffs |= CONFIG_VERSION;
if (screenLayout != o.screenLayout) diffs |= CONFIG_SCREEN_LAYOUT; if (screenLayout != o.screenLayout) diffs |= CONFIG_SCREEN_LAYOUT;
if (uiMode != o.uiMode) diffs |= CONFIG_UI_MODE; if (uiMode != o.uiMode) diffs |= CONFIG_UI_MODE;
if (smallestScreenWidthDp != o.smallestScreenWidthDp) diffs |= CONFIG_SMALLEST_SCREEN_SIZE;
if (screenSizeDp != o.screenSizeDp) diffs |= CONFIG_SCREEN_SIZE; if (screenSizeDp != o.screenSizeDp) diffs |= CONFIG_SCREEN_SIZE;
return diffs; return diffs;
} }
@ -1109,14 +1114,10 @@ struct ResTable_config
} }
} }
if (screenLayout || o.screenLayout) { if (smallestScreenWidthDp || o.smallestScreenWidthDp) {
if (((screenLayout^o.screenLayout) & MASK_SCREENSIZE) != 0) { if (smallestScreenWidthDp != o.smallestScreenWidthDp) {
if (!(screenLayout & MASK_SCREENSIZE)) return false; if (!smallestScreenWidthDp) return false;
if (!(o.screenLayout & MASK_SCREENSIZE)) return true; if (!o.smallestScreenWidthDp) return true;
}
if (((screenLayout^o.screenLayout) & MASK_SCREENLONG) != 0) {
if (!(screenLayout & MASK_SCREENLONG)) return false;
if (!(o.screenLayout & MASK_SCREENLONG)) return true;
} }
} }
@ -1132,6 +1133,17 @@ struct ResTable_config
} }
} }
if (screenLayout || o.screenLayout) {
if (((screenLayout^o.screenLayout) & MASK_SCREENSIZE) != 0) {
if (!(screenLayout & MASK_SCREENSIZE)) return false;
if (!(o.screenLayout & MASK_SCREENSIZE)) return true;
}
if (((screenLayout^o.screenLayout) & MASK_SCREENLONG) != 0) {
if (!(screenLayout & MASK_SCREENLONG)) return false;
if (!(o.screenLayout & MASK_SCREENLONG)) return true;
}
}
if (orientation != o.orientation) { if (orientation != o.orientation) {
if (!orientation) return false; if (!orientation) return false;
if (!o.orientation) return true; if (!o.orientation) return true;
@ -1238,6 +1250,37 @@ struct ResTable_config
} }
} }
if (smallestScreenWidthDp || o.smallestScreenWidthDp) {
// The configuration closest to the actual size is best.
// We assume that larger configs have already been filtered
// out at this point. That means we just want the largest one.
return smallestScreenWidthDp >= o.smallestScreenWidthDp;
}
if (screenSizeDp || o.screenSizeDp) {
// "Better" is based on the sum of the difference between both
// width and height from the requested dimensions. We are
// assuming the invalid configs (with smaller dimens) have
// already been filtered. Note that if a particular dimension
// is unspecified, we will end up with a large value (the
// difference between 0 and the requested dimension), which is
// good since we will prefer a config that has specified a
// dimension value.
int myDelta = 0, otherDelta = 0;
if (requested->screenWidthDp) {
myDelta += requested->screenWidthDp - screenWidthDp;
otherDelta += requested->screenWidthDp - o.screenWidthDp;
}
if (requested->screenHeightDp) {
myDelta += requested->screenHeightDp - screenHeightDp;
otherDelta += requested->screenHeightDp - o.screenHeightDp;
}
//LOGI("Comparing this %dx%d to other %dx%d in %dx%d: myDelta=%d otherDelta=%d",
// screenWidthDp, screenHeightDp, o.screenWidthDp, o.screenHeightDp,
// requested->screenWidthDp, requested->screenHeightDp, myDelta, otherDelta);
return (myDelta <= otherDelta);
}
if (screenLayout || o.screenLayout) { if (screenLayout || o.screenLayout) {
if (((screenLayout^o.screenLayout) & MASK_SCREENSIZE) != 0 if (((screenLayout^o.screenLayout) & MASK_SCREENSIZE) != 0
&& (requested->screenLayout & MASK_SCREENSIZE)) { && (requested->screenLayout & MASK_SCREENSIZE)) {
@ -1270,30 +1313,6 @@ struct ResTable_config
} }
} }
if (screenSizeDp || o.screenSizeDp) {
// Better is based on the sum of the difference between both
// width and height from the requested dimensions. We are
// assuming the invalid configs (with smaller dimens) have
// already been filtered. Note that if a particular dimension
// is unspecified, we will end up with a large value (the
// difference between 0 and the requested dimension), which is
// good since we will prefer a config that has specified a
// dimension value.
int myDelta = 0, otherDelta = 0;
if (requested->screenWidthDp) {
myDelta += requested->screenWidthDp - screenWidthDp;
otherDelta += requested->screenWidthDp - o.screenWidthDp;
}
if (requested->screenHeightDp) {
myDelta += requested->screenHeightDp - screenHeightDp;
otherDelta += requested->screenHeightDp - o.screenHeightDp;
}
//LOGI("Comparing this %dx%d to other %dx%d in %dx%d: myDelta=%d otherDelta=%d",
// screenWidthDp, screenHeightDp, o.screenWidthDp, o.screenHeightDp,
// requested->screenWidthDp, requested->screenHeightDp, myDelta, otherDelta);
return (myDelta <= otherDelta);
}
if ((orientation != o.orientation) && requested->orientation) { if ((orientation != o.orientation) && requested->orientation) {
return (orientation); return (orientation);
} }
@ -1388,14 +1407,24 @@ struct ResTable_config
} }
if (screenSize || o.screenSize) { if (screenSize || o.screenSize) {
if ((screenWidth != o.screenWidth) && requested->screenWidth) { // "Better" is based on the sum of the difference between both
return (screenWidth); // width and height from the requested dimensions. We are
// assuming the invalid configs (with smaller sizes) have
// already been filtered. Note that if a particular dimension
// is unspecified, we will end up with a large value (the
// difference between 0 and the requested dimension), which is
// good since we will prefer a config that has specified a
// size value.
int myDelta = 0, otherDelta = 0;
if (requested->screenWidth) {
myDelta += requested->screenWidth - screenWidth;
otherDelta += requested->screenWidth - o.screenWidth;
} }
if (requested->screenHeight) {
if ((screenHeight != o.screenHeight) && myDelta += requested->screenHeight - screenHeight;
requested->screenHeight) { otherDelta += requested->screenHeight - o.screenHeight;
return (screenHeight);
} }
return (myDelta <= otherDelta);
} }
if (version || o.version) { if (version || o.version) {
@ -1476,15 +1505,20 @@ struct ResTable_config
&& uiModeNight != setUiModeNight) { && uiModeNight != setUiModeNight) {
return false; return false;
} }
if (settings.smallestScreenWidthDp != 0 && smallestScreenWidthDp != 0
&& smallestScreenWidthDp > settings.smallestScreenWidthDp) {
return false;
}
} }
if (screenSizeDp != 0) { if (screenSizeDp != 0) {
if (settings.screenWidthDp != 0 && screenWidthDp != 0 if (settings.screenWidthDp != 0 && screenWidthDp != 0
&& screenWidthDp > settings.screenWidthDp) { && screenWidthDp > settings.screenWidthDp) {
//LOGI("Filtering out width %d in requested %d", screenWidthDp, settings.screenWidthDp); //LOGI("Filtering out width %d in requested %d", screenWidthDp, settings.screenWidthDp);
return false; return false;
} }
if (settings.screenHeightDp != 0 && screenHeightDp != 0 if (settings.screenHeightDp != 0 && screenHeightDp != 0
&& screenHeightDp > settings.screenHeightDp) { && screenHeightDp > settings.screenHeightDp) {
//LOGI("Filtering out height %d in requested %d", screenHeightDp, settings.screenHeightDp); //LOGI("Filtering out height %d in requested %d", screenHeightDp, settings.screenHeightDp);
return false; return false;
} }
@ -1531,11 +1565,11 @@ struct ResTable_config
} }
if (screenSize != 0) { if (screenSize != 0) {
if (settings.screenWidth != 0 && screenWidth != 0 if (settings.screenWidth != 0 && screenWidth != 0
&& screenWidth != settings.screenWidth) { && screenWidth > settings.screenWidth) {
return false; return false;
} }
if (settings.screenHeight != 0 && screenHeight != 0 if (settings.screenHeight != 0 && screenHeight != 0
&& screenHeight != settings.screenHeight) { && screenHeight > settings.screenHeight) {
return false; return false;
} }
} }
@ -1568,13 +1602,13 @@ struct ResTable_config
String8 toString() const { String8 toString() const {
char buf[200]; char buf[200];
sprintf(buf, "imsi=%d/%d lang=%c%c reg=%c%c orient=%d touch=%d dens=%d " sprintf(buf, "imsi=%d/%d lang=%c%c reg=%c%c orient=%d touch=%d dens=%d "
"kbd=%d nav=%d input=%d ssz=%dx%d %ddp x %ddp sz=%d long=%d " "kbd=%d nav=%d input=%d ssz=%dx%d sw%ddp w%ddp h%ddp sz=%d long=%d "
"ui=%d night=%d vers=%d.%d", "ui=%d night=%d vers=%d.%d",
mcc, mnc, mcc, mnc,
language[0] ? language[0] : '-', language[1] ? language[1] : '-', language[0] ? language[0] : '-', language[1] ? language[1] : '-',
country[0] ? country[0] : '-', country[1] ? country[1] : '-', country[0] ? country[0] : '-', country[1] ? country[1] : '-',
orientation, touchscreen, density, keyboard, navigation, inputFlags, orientation, touchscreen, density, keyboard, navigation, inputFlags,
screenWidth, screenHeight, screenWidthDp, screenHeightDp, screenWidth, screenHeight, smallestScreenWidthDp, screenWidthDp, screenHeightDp,
screenLayout&MASK_SCREENSIZE, screenLayout&MASK_SCREENLONG, screenLayout&MASK_SCREENSIZE, screenLayout&MASK_SCREENLONG,
uiMode&MASK_UI_MODE_TYPE, uiMode&MASK_UI_MODE_NIGHT, uiMode&MASK_UI_MODE_TYPE, uiMode&MASK_UI_MODE_NIGHT,
sdkVersion, minorVersion); sdkVersion, minorVersion);

13
libs/utils/ResourceTypes.cpp
View File

@ -2588,7 +2588,7 @@ void ResTable::setParameters(const ResTable_config* params)
{ {
mLock.lock(); mLock.lock();
TABLE_GETENTRY(LOGI("Setting parameters: imsi:%d/%d lang:%c%c cnt:%c%c " TABLE_GETENTRY(LOGI("Setting parameters: imsi:%d/%d lang:%c%c cnt:%c%c "
"orien:%d touch:%d density:%d key:%d inp:%d nav:%d sz:%dx%d %ddp x %ddp\n", "orien:%d touch:%d density:%d key:%d inp:%d nav:%d sz:%dx%d sw%ddp w%ddp h%ddp\n",
params->mcc, params->mnc, params->mcc, params->mnc,
params->language[0] ? params->language[0] : '-', params->language[0] ? params->language[0] : '-',
params->language[1] ? params->language[1] : '-', params->language[1] ? params->language[1] : '-',
@ -2602,6 +2602,7 @@ void ResTable::setParameters(const ResTable_config* params)
params->navigation, params->navigation,
params->screenWidth, params->screenWidth,
params->screenHeight, params->screenHeight,
params->smallestScreenWidthDp,
params->screenWidthDp, params->screenWidthDp,
params->screenHeightDp)); params->screenHeightDp));
mParams = *params; mParams = *params;
@ -3927,7 +3928,7 @@ ssize_t ResTable::getEntry(
TABLE_GETENTRY(LOGI("Match entry 0x%x in type 0x%x (sz 0x%x): imsi:%d/%d=%d/%d " TABLE_GETENTRY(LOGI("Match entry 0x%x in type 0x%x (sz 0x%x): imsi:%d/%d=%d/%d "
"lang:%c%c=%c%c cnt:%c%c=%c%c orien:%d=%d touch:%d=%d " "lang:%c%c=%c%c cnt:%c%c=%c%c orien:%d=%d touch:%d=%d "
"density:%d=%d key:%d=%d inp:%d=%d nav:%d=%d w:%d=%d h:%d=%d " "density:%d=%d key:%d=%d inp:%d=%d nav:%d=%d w:%d=%d h:%d=%d "
"wdp:%d=%d hdp:%d=%d\n", "swdp:%d=%d wdp:%d=%d hdp:%d=%d\n",
entryIndex, typeIndex+1, dtohl(thisType->config.size), entryIndex, typeIndex+1, dtohl(thisType->config.size),
thisConfig.mcc, thisConfig.mnc, thisConfig.mcc, thisConfig.mnc,
config ? config->mcc : 0, config ? config->mnc : 0, config ? config->mcc : 0, config ? config->mnc : 0,
@ -3955,6 +3956,8 @@ ssize_t ResTable::getEntry(
config ? config->screenWidth : 0, config ? config->screenWidth : 0,
thisConfig.screenHeight, thisConfig.screenHeight,
config ? config->screenHeight : 0, config ? config->screenHeight : 0,
thisConfig.smallestScreenWidthDp,
config ? config->smallestScreenWidthDp : 0,
thisConfig.screenWidthDp, thisConfig.screenWidthDp,
config ? config->screenWidthDp : 0, config ? config->screenWidthDp : 0,
thisConfig.screenHeightDp, thisConfig.screenHeightDp,
@ -4244,7 +4247,7 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg,
thisConfig.copyFromDtoH(type->config); thisConfig.copyFromDtoH(type->config);
LOGI("Adding config to type %d: imsi:%d/%d lang:%c%c cnt:%c%c " LOGI("Adding config to type %d: imsi:%d/%d lang:%c%c cnt:%c%c "
"orien:%d touch:%d density:%d key:%d inp:%d nav:%d w:%d h:%d " "orien:%d touch:%d density:%d key:%d inp:%d nav:%d w:%d h:%d "
"wdp:%d hdp:%d\n", "swdp:%d wdp:%d hdp:%d\n",
type->id, type->id,
thisConfig.mcc, thisConfig.mnc, thisConfig.mcc, thisConfig.mnc,
thisConfig.language[0] ? thisConfig.language[0] : '-', thisConfig.language[0] ? thisConfig.language[0] : '-',
@ -4259,6 +4262,7 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg,
thisConfig.navigation, thisConfig.navigation,
thisConfig.screenWidth, thisConfig.screenWidth,
thisConfig.screenHeight, thisConfig.screenHeight,
thisConfig.smallestScreenWidthDp,
thisConfig.screenWidthDp, thisConfig.screenWidthDp,
thisConfig.screenHeightDp)); thisConfig.screenHeightDp));
t->configs.add(type); t->configs.add(type);
@ -4753,6 +4757,9 @@ void ResTable::print(bool inclValues) const
if (type->config.screenHeight != 0) { if (type->config.screenHeight != 0) {
printf(" h=%d", dtohs(type->config.screenHeight)); printf(" h=%d", dtohs(type->config.screenHeight));
} }
if (type->config.smallestScreenWidthDp != 0) {
printf(" swdp=%d", dtohs(type->config.smallestScreenWidthDp));
}
if (type->config.screenWidthDp != 0) { if (type->config.screenWidthDp != 0) {
printf(" wdp=%d", dtohs(type->config.screenWidthDp)); printf(" wdp=%d", dtohs(type->config.screenWidthDp));
} }