From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 20 Aug 2010 19:44:33 +0000 (-0700)
Subject: Fix aapt dump badging to support xlarge screens.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/74fa3103e7da68b2804b9de544b9669850e13900

Fix aapt dump badging to support xlarge screens.

Change-Id: Ieeb757cd48ad9b3f46c5e4aed9d5efaeac834049
---

diff --git a/Command.cpp b/Command.cpp
index 83057b8..35124aa 100644
--- a/Command.cpp
+++ b/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:");