am db7db69a: Merge snapshot variant of donut back into main tree

[android/aapt.git] / Command.cpp

diff --git a/Command.cpp b/Command.cpp
index dc91a48ce24e1eb76149aef578d6e9ec5e8665f4..c0ae592f669269ded8566981800a908fa498bb2d 100644 (file)
--- a/Command.cpp
+++ b/Command.cpp
@@ -8,8 +8,10 @@
 #include "ResourceTable.h"
 #include "XMLNode.h"
 
 #include "ResourceTable.h"
 #include "XMLNode.h"
 

-#include <utils.h>
-#include <utils/ZipFile.h>
+#include <utils/Log.h>
+#include <utils/threads.h>
+#include <utils/List.h>
+#include <utils/Errors.h>

 
 #include <fcntl.h>
 #include <errno.h>
 
 #include <fcntl.h>
 #include <errno.h>


@@ -196,7 +198,7 @@ int doList(Bundle* bundle)
             printf("\nNo resource table found.\n");
         } else {
             printf("\nResource table:\n");
             printf("\nNo resource table found.\n");
         } else {
             printf("\nResource table:\n");

-            res.print();
+            res.print(false);

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


@@ -329,6 +331,9 @@ enum {
     TARGET_SDK_VERSION_ATTR = 0x01010270,
     TEST_ONLY_ATTR = 0x01010272,
     DENSITY_ATTR = 0x0101026c,
     TARGET_SDK_VERSION_ATTR = 0x01010270,
     TEST_ONLY_ATTR = 0x01010272,
     DENSITY_ATTR = 0x0101026c,

+    SMALL_SCREEN_ATTR = 0x01010284,
+    NORMAL_SCREEN_ATTR = 0x01010285,
+    LARGE_SCREEN_ATTR = 0x01010286,

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


@@ -380,7 +385,7 @@ int doDump(Bundle* bundle)
     }
 
     if (strcmp("resources", option) == 0) {
     }
 
     if (strcmp("resources", option) == 0) {

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

 
     } else if (strcmp("xmltree", option) == 0) {
         if (bundle->getFileSpecCount() < 3) {
 
     } else if (strcmp("xmltree", option) == 0) {
         if (bundle->getFileSpecCount() < 3) {


@@ -499,6 +504,10 @@ int doDump(Bundle* bundle)
             bool isLauncherActivity = false;
             bool withinApplication = false;
             bool withinReceiver = false;
             bool isLauncherActivity = false;
             bool withinApplication = false;
             bool withinReceiver = false;

+            int targetSdk = 0;
+            int smallScreen = 1;
+            int normalScreen = 1;
+            int largeScreen = 1;

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


@@ -572,8 +581,10 @@ int doDump(Bundle* bundle)
                                         error.string());
                                 goto bail;
                             }
                                         error.string());
                                 goto bail;
                             }

+                            if (name == "Donut") targetSdk = 4;

                             printf("sdkVersion:'%s'\n", name.string());
                         } else if (code != -1) {
                             printf("sdkVersion:'%s'\n", name.string());
                         } else if (code != -1) {

+                            targetSdk = code;

                             printf("sdkVersion:'%d'\n", code);
                         }
                         code = getIntegerAttribute(tree, TARGET_SDK_VERSION_ATTR, &error);
                             printf("sdkVersion:'%d'\n", code);
                         }
                         code = getIntegerAttribute(tree, TARGET_SDK_VERSION_ATTR, &error);


@@ -585,8 +596,12 @@ int doDump(Bundle* bundle)
                                         error.string());
                                 goto bail;
                             }
                                         error.string());
                                 goto bail;
                             }

+                            if (name == "Donut" && targetSdk < 4) targetSdk = 4;

                             printf("targetSdkVersion:'%s'\n", name.string());
                         } else if (code != -1) {
                             printf("targetSdkVersion:'%s'\n", name.string());
                         } else if (code != -1) {

+                            if (targetSdk < code) {
+                                targetSdk = code;
+                            }

                             printf("targetSdkVersion:'%d'\n", code);
                         }
                     } else if (tag == "uses-configuration") {
                             printf("targetSdkVersion:'%d'\n", code);
                         }
                     } else if (tag == "uses-configuration") {


@@ -625,6 +640,13 @@ int doDump(Bundle* bundle)
                             goto bail;
                         }
                         printf("supports-density:'%d'\n", dens);
                             goto bail;
                         }
                         printf("supports-density:'%d'\n", dens);

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

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


@@ -732,11 +754,31 @@ int doDump(Bundle* bundle)
                            activityIcon.string());
                 }
             }
                            activityIcon.string());
                 }
             }

+            
+            // Determine default values for any unspecified screen sizes,
+            // based on the target SDK of the package.  As of 4 (donut)
+            // the screen size support was introduced, so all default to
+            // enabled.
+            if (smallScreen > 0) {
+                smallScreen = targetSdk >= 4 ? -1 : 0;
+            }
+            if (normalScreen > 0) {
+                normalScreen = -1;
+            }
+            if (largeScreen > 0) {
+                largeScreen = targetSdk >= 4 ? -1 : 0;
+            }
+            printf("supports-screens:");
+            if (smallScreen != 0) printf(" 'small'");
+            if (normalScreen != 0) printf(" 'normal'");
+            if (largeScreen != 0) printf(" 'large'");
+            printf("\n");
+            

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

-            const size_t N = locales.size();
-            for (size_t i=0; i<N; i++) {
+            const size_t NL = locales.size();
+            for (size_t i=0; i<NL; i++) {

                 const char* localeStr =  locales[i].string();
                 if (localeStr == NULL || strlen(localeStr) == 0) {
                     localeStr = "--_--";
                 const char* localeStr =  locales[i].string();
                 if (localeStr == NULL || strlen(localeStr) == 0) {
                     localeStr = "--_--";


@@ -744,6 +786,24 @@ int doDump(Bundle* bundle)
                 printf(" '%s'", localeStr);
             }
             printf("\n");
                 printf(" '%s'", localeStr);
             }
             printf("\n");

+            
+            Vector<ResTable_config> configs;
+            res.getConfigurations(&configs);
+            SortedVector<int> densities;
+            const size_t NC = configs.size();
+            for (size_t i=0; i<NC; i++) {
+                int dens = configs[i].density;
+                if (dens == 0) dens = 160;
+                densities.add(dens);
+            }
+            
+            printf("densities:");
+            const size_t ND = densities.size();
+            for (size_t i=0; i<ND; i++) {
+                printf(" '%d'", densities[i]);
+            }
+            printf("\n");
+            

             AssetDir* dir = assets.openNonAssetDir(assetsCookie, "lib");
             if (dir != NULL) {
                 if (dir->getFileCount() > 0) {
             AssetDir* dir = assets.openNonAssetDir(assetsCookie, "lib");
             if (dir != NULL) {
                 if (dir->getFileCount() > 0) {