diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-20 13:39:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-20 13:39:30 -0700 |
| commit | 42f90ca54fc4c6e0bdbde7caa7d10b6090d11960 (patch) | |
| tree | 5c31c4687a99e85989ab6d39e7dc8e7656563318 | |
| parent | 6be237120e9673e3cfc5243da5bbca287effcf09 (diff) | |
| parent | f43489d7d5e1c0c5c9a7e54c22845fcb99765f81 (diff) | |
| download | frameworks_base-42f90ca54fc4c6e0bdbde7caa7d10b6090d11960.zip frameworks_base-42f90ca54fc4c6e0bdbde7caa7d10b6090d11960.tar.gz frameworks_base-42f90ca54fc4c6e0bdbde7caa7d10b6090d11960.tar.bz2 | |
Merge "Fix aapt dump badging to support xlarge screens." into gingerbread
| -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 83057b8..35124aa 100644 --- a/tools/aapt/Command.cpp +++ b/tools/aapt/Command.cpp @@ -336,6 +336,7 @@ enum { SMALL_SCREEN_ATTR = 0x01010284, NORMAL_SCREEN_ATTR = 0x01010285, LARGE_SCREEN_ATTR = 0x01010286, + XLARGE_SCREEN_ATTR = 0x010102bf, REQUIRED_ATTR = 0x0101028e, }; @@ -569,6 +570,7 @@ int doDump(Bundle* bundle) int smallScreen = 1; int normalScreen = 1; int largeScreen = 1; + int xlargeScreen = 1; String8 pkg; String8 activityName; String8 activityLabel; @@ -751,6 +753,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); @@ -1079,10 +1083,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:"); |