Add new resource configurations for screen width/height in "dp".

[android/aapt.git] / Command.cpp

diff --git a/Command.cpp b/Command.cpp
index f71ebb98344f289a7801ddc1058269c4f76cb2a2..8ac7590152b4296c6e2e592a3b1fe35b27c6d243 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -198,8 +198,10 @@ int doList(Bundle* bundle)
         if (&res == NULL) {
             printf("\nNo resource table found.\n");
         } else {
         if (&res == NULL) {
             printf("\nNo resource table found.\n");
         } else {

+#ifndef HAVE_ANDROID_OS

             printf("\nResource table:\n");
             res.print(false);
             printf("\nResource table:\n");
             res.print(false);

+#endif

         }
 
         Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",
         }
 
         Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",


@@ -332,13 +334,15 @@ enum {
     REQ_FIVE_WAY_NAV_ATTR = 0x01010232,
     TARGET_SDK_VERSION_ATTR = 0x01010270,
     TEST_ONLY_ATTR = 0x01010272,
     REQ_FIVE_WAY_NAV_ATTR = 0x01010232,
     TARGET_SDK_VERSION_ATTR = 0x01010270,
     TEST_ONLY_ATTR = 0x01010272,

-    DENSITY_ATTR = 0x0101026c,
+    ANY_DENSITY_ATTR = 0x0101026c,

     GL_ES_VERSION_ATTR = 0x01010281,
     SMALL_SCREEN_ATTR = 0x01010284,
     NORMAL_SCREEN_ATTR = 0x01010285,
     LARGE_SCREEN_ATTR = 0x01010286,
     XLARGE_SCREEN_ATTR = 0x010102bf,
     REQUIRED_ATTR = 0x0101028e,
     GL_ES_VERSION_ATTR = 0x01010281,
     SMALL_SCREEN_ATTR = 0x01010284,
     NORMAL_SCREEN_ATTR = 0x01010285,
     LARGE_SCREEN_ATTR = 0x01010286,
     XLARGE_SCREEN_ATTR = 0x010102bf,
     REQUIRED_ATTR = 0x0101028e,

+    SCREEN_SIZE_ATTR = 0x010102ca,
+    SCREEN_DENSITY_ATTR = 0x010102cb,

 };
 
 const char *getComponentName(String8 &pkgName, String8 &componentName) {
 };
 
 const char *getComponentName(String8 &pkgName, String8 &componentName) {


@@ -355,6 +359,42 @@ const char *getComponentName(String8 &pkgName, String8 &componentName) {
     return retStr.string();
 }
 
     return retStr.string();
 }
 

+static void printCompatibleScreens(ResXMLTree& tree) {
+    size_t len;
+    ResXMLTree::event_code_t code;
+    int depth = 0;
+    bool first = true;
+    printf("compatible-screens:");
+    while ((code=tree.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) {
+        if (code == ResXMLTree::END_TAG) {
+            depth--;
+            if (depth < 0) {
+                break;
+            }
+            continue;
+        }
+        if (code != ResXMLTree::START_TAG) {
+            continue;
+        }
+        depth++;
+        String8 tag(tree.getElementName(&len));
+        if (tag == "screen") {
+            int32_t screenSize = getIntegerAttribute(tree,
+                    SCREEN_SIZE_ATTR, NULL, -1);
+            int32_t screenDensity = getIntegerAttribute(tree,
+                    SCREEN_DENSITY_ATTR, NULL, -1);
+            if (screenSize > 0 && screenDensity > 0) {
+                if (!first) {
+                    printf(",");
+                }
+                first = false;
+                printf("'%d/%d'", screenSize, screenDensity);
+            }
+        }
+    }
+    printf("\n");
+}
+

 /*
  * Handle the "dump" command, to extract select data from an archive.
  */
 /*
  * Handle the "dump" command, to extract select data from an archive.
  */


@@ -390,8 +430,9 @@ int doDump(Bundle* bundle)
     }
 
     if (strcmp("resources", option) == 0) {
     }
 
     if (strcmp("resources", option) == 0) {

+#ifndef HAVE_ANDROID_OS

         res.print(bundle->getValues());
         res.print(bundle->getValues());

-
+#endif

     } else if (strcmp("xmltree", option) == 0) {
         if (bundle->getFileSpecCount() < 3) {
             fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");
     } else if (strcmp("xmltree", option) == 0) {
         if (bundle->getFileSpecCount() < 3) {
             fprintf(stderr, "ERROR: no dump xmltree resource file specified\n");


@@ -572,6 +613,7 @@ int doDump(Bundle* bundle)
             int normalScreen = 1;
             int largeScreen = 1;
             int xlargeScreen = 1;
             int normalScreen = 1;
             int largeScreen = 1;
             int xlargeScreen = 1;

+            int anyDensity = 1;

             String8 pkg;
             String8 activityName;
             String8 activityLabel;
             String8 pkg;
             String8 activityName;
             String8 activityLabel;


@@ -739,14 +781,6 @@ int doDump(Bundle* bundle)
                             printf(" reqFiveWayNav='%d'", reqFiveWayNav);
                         }
                         printf("\n");
                             printf(" reqFiveWayNav='%d'", reqFiveWayNav);
                         }
                         printf("\n");

-                    } else if (tag == "supports-density") {
-                        int32_t dens = getIntegerAttribute(tree, DENSITY_ATTR, &error);
-                        if (error != "") {
-                            fprintf(stderr, "ERROR getting 'android:density' attribute: %s\n",
-                                    error.string());
-                            goto bail;
-                        }
-                        printf("supports-density:'%d'\n", dens);

                     } else if (tag == "supports-screens") {
                         smallScreen = getIntegerAttribute(tree,
                                 SMALL_SCREEN_ATTR, NULL, 1);
                     } else if (tag == "supports-screens") {
                         smallScreen = getIntegerAttribute(tree,
                                 SMALL_SCREEN_ATTR, NULL, 1);


@@ -756,6 +790,8 @@ int doDump(Bundle* bundle)
                                 LARGE_SCREEN_ATTR, NULL, 1);
                         xlargeScreen = getIntegerAttribute(tree,
                                 XLARGE_SCREEN_ATTR, NULL, 1);
                                 LARGE_SCREEN_ATTR, NULL, 1);
                         xlargeScreen = getIntegerAttribute(tree,
                                 XLARGE_SCREEN_ATTR, NULL, 1);

+                        anyDensity = getIntegerAttribute(tree,
+                                ANY_DENSITY_ATTR, NULL, 1);

                     } else if (tag == "uses-feature") {
                         String8 name = getAttribute(tree, NAME_ATTR, &error);
 
                     } else if (tag == "uses-feature") {
                         String8 name = getAttribute(tree, NAME_ATTR, &error);
 


@@ -871,6 +907,18 @@ int doDump(Bundle* bundle)
                                     error.string());
                                 goto bail;
                         }
                                     error.string());
                                 goto bail;
                         }

+                    } else if (tag == "supports-gl-texture") {
+                        String8 name = getAttribute(tree, NAME_ATTR, &error);
+                        if (name != "" && error == "") {
+                            printf("supports-gl-texture:'%s'\n", name.string());
+                        } else {
+                            fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
+                                    error.string());
+                                goto bail;
+                        }
+                    } else if (tag == "compatible-screens") {
+                        printCompatibleScreens(tree);
+                        depth--;

                     }
                 } else if (depth == 3 && withinApplication) {
                     withinActivity = false;
                     }
                 } else if (depth == 3 && withinApplication) {
                     withinActivity = false;


@@ -1094,8 +1142,11 @@ int doDump(Bundle* bundle)
                 largeScreen = targetSdk >= 4 ? -1 : 0;
             }
             if (xlargeScreen > 0) {
                 largeScreen = targetSdk >= 4 ? -1 : 0;
             }
             if (xlargeScreen > 0) {

-                // Introduced in Honeycomb.
-                xlargeScreen = targetSdk >= 10 ? -1 : 0;
+                // Introduced in Gingerbread.
+                xlargeScreen = targetSdk >= 9 ? -1 : 0;
+            }
+            if (anyDensity > 0) {
+                anyDensity = targetSdk >= 4 ? -1 : 0;

             }
             printf("supports-screens:");
             if (smallScreen != 0) printf(" 'small'");
             }
             printf("supports-screens:");
             if (smallScreen != 0) printf(" 'small'");


@@ -1104,6 +1155,8 @@ int doDump(Bundle* bundle)
             if (xlargeScreen != 0) printf(" 'xlarge'");
             printf("\n");
 
             if (xlargeScreen != 0) printf(" 'xlarge'");
             printf("\n");
 

+            printf("supports-any-density: '%s'\n", anyDensity ? "true" : "false");
+

             printf("locales:");
             Vector<String8> locales;
             res.getLocales(&locales);
             printf("locales:");
             Vector<String8> locales;
             res.getLocales(&locales);