diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-24 09:02:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 09:02:43 -0700 |
| commit | cc5239b78b7d418d78d00bf9ee92192ccd851cda (patch) | |
| tree | 8ddd004b70fc4a9fe109354f7b684db4464d9677 /tools/aapt | |
| parent | e0e6a0fc8e7962b7a6f68281fbb038c546dcdf7a (diff) | |
| parent | 8b569c8d49924d849793513a5418ef0350320962 (diff) | |
| download | frameworks_base-cc5239b78b7d418d78d00bf9ee92192ccd851cda.zip frameworks_base-cc5239b78b7d418d78d00bf9ee92192ccd851cda.tar.gz frameworks_base-cc5239b78b7d418d78d00bf9ee92192ccd851cda.tar.bz2 | |
am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread
Merge commit '8b569c8d49924d849793513a5418ef0350320962'
* commit '8b569c8d49924d849793513a5418ef0350320962':
Fix aapt dump badging to support xlarge screens.
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/Command.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp index c40af80..abccf9b 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -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:"); |