Expand support for different screen sizes.

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index d07e4de565fe6f17ec093d583e5aca51e92db372..67af116d372dc5e67dff6bc01cba8e13d053fb2e 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -17,7 +17,6 @@ static const char* kWildcardName = "any";
 static const char* kAssetDir = "assets";
 static const char* kResourceDir = "res";
 static const char* kInvalidChars = "/\\:";
 static const char* kAssetDir = "assets";
 static const char* kResourceDir = "res";
 static const char* kInvalidChars = "/\\:";

-static const char* kExcludeExtension = ".EXCLUDE";

 static const size_t kMaxAssetFileName = 100;
 
 static const String8 kResString(kResourceDir);
 static const size_t kMaxAssetFileName = 100;
 
 static const String8 kResString(kResourceDir);


@@ -78,7 +77,7 @@ static bool isHidden(const char *root, const char *path)
         // Skip CVS but don't chatter about it.
         return true;
     } else if (strcasecmp(path, "thumbs.db") == 0
         // Skip CVS but don't chatter about it.
         return true;
     } else if (strcasecmp(path, "thumbs.db") == 0

-               || strcasecmp(path, "picassa.ini") == 0) {
+               || strcasecmp(path, "picasa.ini") == 0) {

         // Skip suspected image indexes files.
         type = "index";
     } else if (path[strlen(path)-1] == '~') {
         // Skip suspected image indexes files.
         type = "index";
     } else if (path[strlen(path)-1] == '~') {


@@ -100,7 +99,7 @@ static bool isHidden(const char *root, const char *path)
 
     return true;
 }
 
     return true;
 }

- 
+

 // =========================================================================
 // =========================================================================
 // =========================================================================
 // =========================================================================
 // =========================================================================
 // =========================================================================


@@ -159,28 +158,28 @@ AaptGroupEntry::parseNamePart(const String8& part, int* axis, uint32_t* value)
         *value = config.touchscreen;
         return 0;
     }
         *value = config.touchscreen;
         return 0;
     }

-    
+

     // keyboard hidden
     if (getKeysHiddenName(part.string(), &config)) {
         *axis = AXIS_KEYSHIDDEN;
         *value = config.inputFlags;
         return 0;
     }
     // keyboard hidden
     if (getKeysHiddenName(part.string(), &config)) {
         *axis = AXIS_KEYSHIDDEN;
         *value = config.inputFlags;
         return 0;
     }

-    
+

     // keyboard
     if (getKeyboardName(part.string(), &config)) {
         *axis = AXIS_KEYBOARD;
         *value = config.keyboard;
         return 0;
     }
     // keyboard
     if (getKeyboardName(part.string(), &config)) {
         *axis = AXIS_KEYBOARD;
         *value = config.keyboard;
         return 0;
     }

-    
+

     // navigation
     if (getNavigationName(part.string(), &config)) {
         *axis = AXIS_NAVIGATION;
         *value = config.navigation;
         return 0;
     }
     // navigation
     if (getNavigationName(part.string(), &config)) {
         *axis = AXIS_NAVIGATION;
         *value = config.navigation;
         return 0;
     }

-    
+

     // screen size
     if (getScreenSizeName(part.string(), &config)) {
         *axis = AXIS_SCREENSIZE;
     // screen size
     if (getScreenSizeName(part.string(), &config)) {
         *axis = AXIS_SCREENSIZE;


@@ -188,6 +187,13 @@ AaptGroupEntry::parseNamePart(const String8& part, int* axis, uint32_t* value)
         return 0;
     }
 
         return 0;
     }
 

+    // screen layout
+    if (getScreenLayoutName(part.string(), &config)) {
+        *axis = AXIS_SCREENLAYOUT;
+        *value = config.screenLayout;
+        return 0;
+    }
+

     // version
     if (getVersionName(part.string(), &config)) {
         *axis = AXIS_VERSION;
     // version
     if (getVersionName(part.string(), &config)) {
         *axis = AXIS_VERSION;


@@ -203,7 +209,7 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
 {
     Vector<String8> parts;
 
 {
     Vector<String8> parts;
 

-    String8 mcc, mnc, loc, orient, den, touch, key, keysHidden, nav, size, vers;
+    String8 mcc, mnc, loc, orient, den, touch, key, keysHidden, nav, size, layout, vers;

 
     const char *p = dir;
     const char *q;
 
     const char *p = dir;
     const char *q;


@@ -319,7 +325,7 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
     // touchscreen
     if (getTouchscreenName(part.string())) {
         touch = part;
     // touchscreen
     if (getTouchscreenName(part.string())) {
         touch = part;

-        
+

         index++;
         if (index == N) {
             goto success;
         index++;
         if (index == N) {
             goto success;


@@ -328,11 +334,11 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
     } else {
         //printf("not touchscreen: %s\n", part.string());
     }
     } else {
         //printf("not touchscreen: %s\n", part.string());
     }

-    
+

     // keyboard hidden
     if (getKeysHiddenName(part.string())) {
         keysHidden = part;
     // keyboard hidden
     if (getKeysHiddenName(part.string())) {
         keysHidden = part;

-        
+

         index++;
         if (index == N) {
             goto success;
         index++;
         if (index == N) {
             goto success;


@@ -341,11 +347,11 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
     } else {
         //printf("not keysHidden: %s\n", part.string());
     }
     } else {
         //printf("not keysHidden: %s\n", part.string());
     }

-    
+

     // keyboard
     if (getKeyboardName(part.string())) {
         key = part;
     // keyboard
     if (getKeyboardName(part.string())) {
         key = part;

-        
+

         index++;
         if (index == N) {
             goto success;
         index++;
         if (index == N) {
             goto success;


@@ -354,10 +360,10 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
     } else {
         //printf("not keyboard: %s\n", part.string());
     }
     } else {
         //printf("not keyboard: %s\n", part.string());
     }

-    
+

     if (getNavigationName(part.string())) {
         nav = part;
     if (getNavigationName(part.string())) {
         nav = part;

-        
+

         index++;
         if (index == N) {
             goto success;
         index++;
         if (index == N) {
             goto success;


@@ -366,10 +372,10 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
     } else {
         //printf("not navigation: %s\n", part.string());
     }
     } else {
         //printf("not navigation: %s\n", part.string());
     }

-    
+

     if (getScreenSizeName(part.string())) {
         size = part;
     if (getScreenSizeName(part.string())) {
         size = part;

-        
+

         index++;
         if (index == N) {
             goto success;
         index++;
         if (index == N) {
             goto success;


@@ -378,10 +384,22 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
     } else {
         //printf("not screen size: %s\n", part.string());
     }
     } else {
         //printf("not screen size: %s\n", part.string());
     }

-    
+
+    if (getScreenLayoutName(part.string())) {
+        layout = part;
+
+        index++;
+        if (index == N) {
+            goto success;
+        }
+        part = parts[index];
+    } else {
+        //printf("not screen layout: %s\n", part.string());
+    }
+

     if (getVersionName(part.string())) {
         vers = part;
     if (getVersionName(part.string())) {
         vers = part;

-        
+

         index++;
         if (index == N) {
             goto success;
         index++;
         if (index == N) {
             goto success;


@@ -390,7 +408,7 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
     } else {
         //printf("not version: %s\n", part.string());
     }
     } else {
         //printf("not version: %s\n", part.string());
     }

-    
+

     // if there are extra parts, it doesn't match
     return false;
 
     // if there are extra parts, it doesn't match
     return false;
 


@@ -405,6 +423,7 @@ success:
     this->keyboard = key;
     this->navigation = nav;
     this->screenSize = size;
     this->keyboard = key;
     this->navigation = nav;
     this->screenSize = size;

+    this->screenLayout = layout;

     this->version = vers;
 
     // what is this anyway?
     this->version = vers;
 
     // what is this anyway?


@@ -436,6 +455,8 @@ AaptGroupEntry::toString() const
     s += ",";
     s += screenSize;
     s += ",";
     s += ",";
     s += screenSize;
     s += ",";

+    s += screenLayout;
+    s += ",";

     s += version;
     return s;
 }
     s += version;
     return s;
 }


@@ -484,11 +505,15 @@ AaptGroupEntry::toDirName(const String8& resType) const
         s += "-";
         s += screenSize;
     }
         s += "-";
         s += screenSize;
     }

+    if (this->screenLayout != "") {
+        s += "-";
+        s += screenLayout;
+    }

     if (this->version != "") {
         s += "-";
         s += version;
     }
     if (this->version != "") {
         s += "-";
         s += version;
     }

-    
+

     return s;
 }
 
     return s;
 }
 


@@ -506,9 +531,9 @@ bool AaptGroupEntry::getMccName(const char* name,
     c++;
     if (tolower(*c) != 'c') return false;
     c++;
     c++;
     if (tolower(*c) != 'c') return false;
     c++;

-    
+

     const char* val = c;
     const char* val = c;

-    
+

     while (*c >= '0' && *c <= '9') {
         c++;
     }
     while (*c >= '0' && *c <= '9') {
         c++;
     }


@@ -538,9 +563,9 @@ bool AaptGroupEntry::getMncName(const char* name,
     c++;
     if (tolower(*c) != 'c') return false;
     c++;
     c++;
     if (tolower(*c) != 'c') return false;
     c++;

-    
+

     const char* val = c;
     const char* val = c;

-    
+

     while (*c >= '0' && *c <= '9') {
         c++;
     }
     while (*c >= '0' && *c <= '9') {
         c++;
     }


@@ -621,7 +646,7 @@ bool AaptGroupEntry::getOrientationName(const char* name,
         if (out) out->orientation = out->ORIENTATION_SQUARE;
         return true;
     }
         if (out) out->orientation = out->ORIENTATION_SQUARE;
         return true;
     }

-    
+

     return false;
 }
 
     return false;
 }
 


@@ -677,7 +702,7 @@ bool AaptGroupEntry::getTouchscreenName(const char* name,
         if (out) out->touchscreen = out->TOUCHSCREEN_FINGER;
         return true;
     }
         if (out) out->touchscreen = out->TOUCHSCREEN_FINGER;
         return true;
     }

-    
+

     return false;
 }
 
     return false;
 }
 


@@ -695,13 +720,16 @@ bool AaptGroupEntry::getKeysHiddenName(const char* name,
     } else if (strcmp(name, "keyshidden") == 0) {
         mask = out->MASK_KEYSHIDDEN;
         value = out->KEYSHIDDEN_YES;
     } else if (strcmp(name, "keyshidden") == 0) {
         mask = out->MASK_KEYSHIDDEN;
         value = out->KEYSHIDDEN_YES;

+    } else if (strcmp(name, "keyssoft") == 0) {
+        mask = out->MASK_KEYSHIDDEN;
+        value = out->KEYSHIDDEN_SOFT;

     }
     }

-    
+

     if (mask != 0) {
         if (out) out->inputFlags = (out->inputFlags&~mask) | value;
         return true;
     }
     if (mask != 0) {
         if (out) out->inputFlags = (out->inputFlags&~mask) | value;
         return true;
     }

-    
+

     return false;
 }
 
     return false;
 }
 


@@ -721,7 +749,7 @@ bool AaptGroupEntry::getKeyboardName(const char* name,
         if (out) out->keyboard = out->KEYBOARD_12KEY;
         return true;
     }
         if (out) out->keyboard = out->KEYBOARD_12KEY;
         return true;
     }

-    
+

     return false;
 }
 
     return false;
 }
 


@@ -744,7 +772,7 @@ bool AaptGroupEntry::getNavigationName(const char* name,
         if (out) out->navigation = out->NAVIGATION_WHEEL;
         return true;
     }
         if (out) out->navigation = out->NAVIGATION_WHEEL;
         return true;
     }

-    
+

     return false;
 }
 
     return false;
 }
 


@@ -758,32 +786,52 @@ bool AaptGroupEntry::getScreenSizeName(const char* name,
         }
         return true;
     }
         }
         return true;
     }

-     
+

     const char* x = name;
     while (*x >= '0' && *x <= '9') x++;
     if (x == name || *x != 'x') return false;
     String8 xName(name, x-name);
     x++;
     const char* x = name;
     while (*x >= '0' && *x <= '9') x++;
     if (x == name || *x != 'x') return false;
     String8 xName(name, x-name);
     x++;

-    
+

     const char* y = x;
     while (*y >= '0' && *y <= '9') y++;
     if (y == name || *y != 0) return false;
     String8 yName(x, y-x);
     const char* y = x;
     while (*y >= '0' && *y <= '9') y++;
     if (y == name || *y != 0) return false;
     String8 yName(x, y-x);

-    
+

     uint16_t w = (uint16_t)atoi(xName.string());
     uint16_t h = (uint16_t)atoi(yName.string());
     if (w < h) {
         return false;
     }
     uint16_t w = (uint16_t)atoi(xName.string());
     uint16_t h = (uint16_t)atoi(yName.string());
     if (w < h) {
         return false;
     }

-    
+

     if (out) {
         out->screenWidth = w;
         out->screenHeight = h;
     }
     if (out) {
         out->screenWidth = w;
         out->screenHeight = h;
     }

-    
+

     return true;
 }
 
     return true;
 }
 

+bool AaptGroupEntry::getScreenLayoutName(const char* name,
+                                     ResTable_config* out)
+{
+    if (strcmp(name, kWildcardName) == 0) {
+        if (out) out->screenLayout = out->SCREENLAYOUT_ANY;
+        return true;
+    } else if (strcmp(name, "smallscreen") == 0) {
+        if (out) out->screenLayout = out->SCREENLAYOUT_SMALL;
+        return true;
+    } else if (strcmp(name, "normalscreen") == 0) {
+        if (out) out->screenLayout = out->SCREENLAYOUT_NORMAL;
+        return true;
+    } else if (strcmp(name, "largescreen") == 0) {
+        if (out) out->screenLayout = out->SCREENLAYOUT_LARGE;
+        return true;
+    }
+
+    return false;
+}
+

 bool AaptGroupEntry::getVersionName(const char* name,
                                     ResTable_config* out)
 {
 bool AaptGroupEntry::getVersionName(const char* name,
                                     ResTable_config* out)
 {


@@ -794,22 +842,22 @@ bool AaptGroupEntry::getVersionName(const char* name,
         }
         return true;
     }
         }
         return true;
     }

-    
+

     if (*name != 'v') {
         return false;
     }
     if (*name != 'v') {
         return false;
     }

-    
+

     name++;
     const char* s = name;
     while (*s >= '0' && *s <= '9') s++;
     if (s == name || *s != 0) return false;
     String8 sdkName(name, s-name);
     name++;
     const char* s = name;
     while (*s >= '0' && *s <= '9') s++;
     if (s == name || *s != 0) return false;
     String8 sdkName(name, s-name);

-    
+

     if (out) {
         out->sdkVersion = (uint16_t)atoi(sdkName.string());
         out->minorVersion = 0;
     }
     if (out) {
         out->sdkVersion = (uint16_t)atoi(sdkName.string());
         out->minorVersion = 0;
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -826,6 +874,7 @@ int AaptGroupEntry::compare(const AaptGroupEntry& o) const
     if (v == 0) v = keyboard.compare(o.keyboard);
     if (v == 0) v = navigation.compare(o.navigation);
     if (v == 0) v = screenSize.compare(o.screenSize);
     if (v == 0) v = keyboard.compare(o.keyboard);
     if (v == 0) v = navigation.compare(o.navigation);
     if (v == 0) v = screenSize.compare(o.screenSize);

+    if (v == 0) v = screenLayout.compare(o.screenLayout);

     if (v == 0) v = version.compare(o.version);
     return v;
 }
     if (v == 0) v = version.compare(o.version);
     return v;
 }


@@ -844,6 +893,7 @@ ResTable_config AaptGroupEntry::toParams() const
     getKeyboardName(keyboard.string(), &params);
     getNavigationName(navigation.string(), &params);
     getScreenSizeName(screenSize.string(), &params);
     getKeyboardName(keyboard.string(), &params);
     getNavigationName(navigation.string(), &params);
     getScreenSizeName(screenSize.string(), &params);

+    getScreenLayoutName(screenLayout.string(), &params);

     getVersionName(version.string(), &params);
     return params;
 }
     getVersionName(version.string(), &params);
     return params;
 }


@@ -1078,29 +1128,29 @@ ssize_t AaptDir::slurpFullTree(Bundle* bundle, const String8& srcDir,
 
     {
         DIR* dir = NULL;
 
     {
         DIR* dir = NULL;

-    
+

         dir = opendir(srcDir.string());
         if (dir == NULL) {
             fprintf(stderr, "ERROR: opendir(%s): %s\n", srcDir.string(), strerror(errno));
             return UNKNOWN_ERROR;
         }
         dir = opendir(srcDir.string());
         if (dir == NULL) {
             fprintf(stderr, "ERROR: opendir(%s): %s\n", srcDir.string(), strerror(errno));
             return UNKNOWN_ERROR;
         }

-    
+

         /*
          * Slurp the filenames out of the directory.
          */
         while (1) {
             struct dirent* entry;
         /*
          * Slurp the filenames out of the directory.
          */
         while (1) {
             struct dirent* entry;

-    
+

             entry = readdir(dir);
             if (entry == NULL)
                 break;
             entry = readdir(dir);
             if (entry == NULL)
                 break;

-  
+

             if (isHidden(srcDir.string(), entry->d_name))
                 continue;
 
             fileNames.add(String8(entry->d_name));
         }
             if (isHidden(srcDir.string(), entry->d_name))
                 continue;
 
             fileNames.add(String8(entry->d_name));
         }

-    
+

         closedir(dir);
     }
 
         closedir(dir);
     }
 


@@ -1312,7 +1362,7 @@ void AaptAssets::addResource(const String8& leafName, const String8& path,
     sp<AaptDir> subdir = res->makeDir(dirname);
     sp<AaptGroup> grr = new AaptGroup(leafName, path);
     grr->addFile(file);
     sp<AaptDir> subdir = res->makeDir(dirname);
     sp<AaptGroup> grr = new AaptGroup(leafName, path);
     grr->addFile(file);

-    
+

     subdir->addFile(leafName, grr);
 }
 
     subdir->addFile(leafName, grr);
 }
 


@@ -1321,10 +1371,10 @@ ssize_t AaptAssets::slurpFromArgs(Bundle* bundle)
 {
     int count;
     int totalCount = 0;
 {
     int count;
     int totalCount = 0;

-    int i;
-    int arg = 0;

     FileType type;
     FileType type;

-    const char* res;
+    const Vector<const char *>& resDirs = bundle->getResourceSourceDirs();
+    const size_t dirCount =resDirs.size();
+    sp<AaptAssets> current = this;

 
     const int N = bundle->getFileSpecCount();
 
 
     const int N = bundle->getFileSpecCount();
 


@@ -1377,28 +1427,35 @@ ssize_t AaptAssets::slurpFromArgs(Bundle* bundle)
     /*
      * If a directory of resource-specific assets was supplied, slurp 'em up.
      */
     /*
      * If a directory of resource-specific assets was supplied, slurp 'em up.
      */

-    res = bundle->getResourceSourceDir();
-    if (res) {
-        type = getFileType(res);
-        if (type == kFileTypeNonexistent) {
-            fprintf(stderr, "ERROR: resource directory '%s' does not exist\n", res);
-            return UNKNOWN_ERROR;
-        }
-        if (type == kFileTypeDirectory) {
-            count = slurpResourceTree(bundle, String8(res));
+    for (size_t i=0; i<dirCount; i++) {
+        const char *res = resDirs[i];
+        if (res) {
+            type = getFileType(res);
+            if (type == kFileTypeNonexistent) {
+                fprintf(stderr, "ERROR: resource directory '%s' does not exist\n", res);
+                return UNKNOWN_ERROR;
+            }
+            if (type == kFileTypeDirectory) {
+                if (i>0) {
+                    sp<AaptAssets> nextOverlay = new AaptAssets();
+                    current->setOverlay(nextOverlay);
+                    current = nextOverlay;
+                }
+                count = current->slurpResourceTree(bundle, String8(res));

 
 

-            if (count < 0) {
-                totalCount = count;
-                goto bail;
+                if (count < 0) {
+                    totalCount = count;
+                    goto bail;
+                }
+                totalCount += count;
+            }
+            else {
+                fprintf(stderr, "ERROR: '%s' is not a directory\n", res);
+                return UNKNOWN_ERROR;

             }
             }

-            totalCount += count;
-        }
-        else {
-            fprintf(stderr, "ERROR: '%s' is not a directory\n", res);
-            return UNKNOWN_ERROR;

         }
         }

+        

     }
     }

-    

     /*
      * Now do any additional raw files.
      */
     /*
      * Now do any additional raw files.
      */