drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix aapt dump badging to support xlarge screens." into gingerbread

Browse Source
This commit is contained in:
Dianne Hackborn
2010-08-20 13:39:30 -07:00
committed by Android (Google) Code Review
parent 6be237120e f43489d7d5
commit 42f90ca54f
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

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