Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread

Browse Source 
Merge commit '8b569c8d49924d849793513a5418ef0350320962'

* commit '8b569c8d49924d849793513a5418ef0350320962':
  Fix aapt dump badging to support xlarge screens.
This commit is contained in:
Dianne Hackborn
2010-08-24 09:02:43 -07:00
committed by Android Git Automerger
parent e0e6a0fc8e 8b569c8d49
commit cc5239b78b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/aapt/Command.cpp
View File

@@ -338,6 +338,7 @@ enum {
SMALL_SCREEN_ATTR = 0x01010284,
NORMAL_SCREEN_ATTR = 0x01010285,
LARGE_SCREEN_ATTR = 0x01010286,
XLARGE_SCREEN_ATTR = 0x010102bf,
REQUIRED_ATTR = 0x0101028e,
};
@@ -572,6 +573,7 @@ int doDump(Bundle* bundle)
int smallScreen = 1;
int normalScreen = 1;
int largeScreen = 1;
int xlargeScreen = 1;
String8 pkg;
String8 activityName;
String8 activityLabel;
@@ -754,6 +756,8 @@ int doDump(Bundle* bundle)
NORMAL_SCREEN_ATTR, NULL, 1);
largeScreen = getIntegerAttribute(tree,
LARGE_SCREEN_ATTR, NULL, 1);
xlargeScreen = getIntegerAttribute(tree,
XLARGE_SCREEN_ATTR, NULL, 1);
} else if (tag == "uses-feature") {
String8 name = getAttribute(tree, NAME_ATTR, &error);
@@ -1082,10 +1086,15 @@ int doDump(Bundle* bundle)
if (largeScreen > 0) {
largeScreen = targetSdk >= 4 ? -1 : 0;
}
if (xlargeScreen > 0) {
// Introduced in Honeycomb.
xlargeScreen = targetSdk >= 10 ? -1 : 0;
}
printf("supports-screens:");
if (smallScreen != 0) printf(" 'small'");
if (normalScreen != 0) printf(" 'normal'");
if (largeScreen != 0) printf(" 'large'");
if (xlargeScreen != 0) printf(" 'xlarge'");
printf("\n");
printf("locales:");