am a5a8cc13: resolved conflicts for merge of ce307f88 to eclair-mr2

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 027662d84d26ef4caba55a4e09c1192311719c86..c346b90d5a84a26a9d0f20e4b093025d82ddac67 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);


@@ -56,6 +55,7 @@ static bool validateFileName(const char* fileName)
 
 static bool isHidden(const char *root, const char *path)
 {
 
 static bool isHidden(const char *root, const char *path)
 {

+    const char *ext  = NULL;

     const char *type = NULL;
 
     // Skip all hidden files.
     const char *type = NULL;
 
     // Skip all hidden files.


@@ -84,6 +84,9 @@ static bool isHidden(const char *root, const char *path)
     } else if (path[strlen(path)-1] == '~') {
         // Skip suspected emacs backup files.
         type = "backup";
     } else if (path[strlen(path)-1] == '~') {
         // Skip suspected emacs backup files.
         type = "backup";

+    } else if ((ext = strrchr(path, '.')) != NULL && strcmp(ext, ".scc") == 0) {
+        // Skip VisualSourceSafe files and don't chatter about it
+        return true;

     } else {
         // Let everything else through.
         return false;
     } else {
         // Let everything else through.
         return false;


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

- 
+

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


@@ -139,6 +142,20 @@ AaptGroupEntry::parseNamePart(const String8& part, int* axis, uint32_t* value)
         return 0;
     }
 
         return 0;
     }
 

+    // screen layout size
+    if (getScreenLayoutSizeName(part.string(), &config)) {
+        *axis = AXIS_SCREENLAYOUTSIZE;
+        *value = (config.screenLayout&ResTable_config::MASK_SCREENSIZE);
+        return 0;
+    }
+
+    // screen layout long
+    if (getScreenLayoutLongName(part.string(), &config)) {
+        *axis = AXIS_SCREENLAYOUTLONG;
+        *value = (config.screenLayout&ResTable_config::MASK_SCREENLONG);
+        return 0;
+    }
+

     // orientation
     if (getOrientationName(part.string(), &config)) {
         *axis = AXIS_ORIENTATION;
     // orientation
     if (getOrientationName(part.string(), &config)) {
         *axis = AXIS_ORIENTATION;


@@ -159,28 +176,35 @@ 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 hidden
+    if (getNavHiddenName(part.string(), &config)) {
+        *axis = AXIS_NAVHIDDEN;
+        *value = config.inputFlags;
+        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;


@@ -203,7 +227,8 @@ 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, layoutsize, layoutlong, orient, den;
+    String8 touch, key, keysHidden, nav, navHidden, size, vers;

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


@@ -290,6 +315,30 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
         //printf("not region: %s\n", part.string());
     }
 
         //printf("not region: %s\n", part.string());
     }
 

+    if (getScreenLayoutSizeName(part.string())) {
+        layoutsize = part;
+
+        index++;
+        if (index == N) {
+            goto success;
+        }
+        part = parts[index];
+    } else {
+        //printf("not screen layout size: %s\n", part.string());
+    }
+
+    if (getScreenLayoutLongName(part.string())) {
+        layoutlong = part;
+
+        index++;
+        if (index == N) {
+            goto success;
+        }
+        part = parts[index];
+    } else {
+        //printf("not screen layout long: %s\n", part.string());
+    }
+

     // orientation
     if (getOrientationName(part.string())) {
         orient = part;
     // orientation
     if (getOrientationName(part.string())) {
         orient = part;


@@ -319,7 +368,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 +377,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 +390,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 +403,23 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
     } else {
         //printf("not keyboard: %s\n", part.string());
     }
     } else {
         //printf("not keyboard: %s\n", part.string());
     }

-    
+
+    // navigation hidden
+    if (getNavHiddenName(part.string())) {
+        navHidden = part;
+
+        index++;
+        if (index == N) {
+            goto success;
+        }
+        part = parts[index];
+    } else {
+        //printf("not navHidden: %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 +428,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 +440,10 @@ 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 (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 +452,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;
 


@@ -398,11 +460,14 @@ success:
     this->mcc = mcc;
     this->mnc = mnc;
     this->locale = loc;
     this->mcc = mcc;
     this->mnc = mnc;
     this->locale = loc;

+    this->screenLayoutSize = layoutsize;
+    this->screenLayoutLong = layoutlong;

     this->orientation = orient;
     this->density = den;
     this->touchscreen = touch;
     this->keysHidden = keysHidden;
     this->keyboard = key;
     this->orientation = orient;
     this->density = den;
     this->touchscreen = touch;
     this->keysHidden = keysHidden;
     this->keyboard = key;

+    this->navHidden = navHidden;

     this->navigation = nav;
     this->screenSize = size;
     this->version = vers;
     this->navigation = nav;
     this->screenSize = size;
     this->version = vers;


@@ -422,6 +487,10 @@ AaptGroupEntry::toString() const
     s += ",";
     s += this->locale;
     s += ",";
     s += ",";
     s += this->locale;
     s += ",";

+    s += screenLayoutSize;
+    s += ",";
+    s += screenLayoutLong;
+    s += ",";

     s += this->orientation;
     s += ",";
     s += density;
     s += this->orientation;
     s += ",";
     s += density;


@@ -432,6 +501,8 @@ AaptGroupEntry::toString() const
     s += ",";
     s += keyboard;
     s += ",";
     s += ",";
     s += keyboard;
     s += ",";

+    s += navHidden;
+    s += ",";

     s += navigation;
     s += ",";
     s += screenSize;
     s += navigation;
     s += ",";
     s += screenSize;


@@ -456,6 +527,14 @@ AaptGroupEntry::toDirName(const String8& resType) const
         s += "-";
         s += locale;
     }
         s += "-";
         s += locale;
     }

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

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


@@ -476,6 +555,10 @@ AaptGroupEntry::toDirName(const String8& resType) const
         s += "-";
         s += keyboard;
     }
         s += "-";
         s += keyboard;
     }

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

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


@@ -488,7 +571,7 @@ AaptGroupEntry::toDirName(const String8& resType) const
         s += "-";
         s += version;
     }
         s += "-";
         s += version;
     }

-    
+

     return s;
 }
 
     return s;
 }
 


@@ -506,9 +589,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 +621,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++;
     }


@@ -605,6 +688,57 @@ bool AaptGroupEntry::getLocaleName(const char* fileName,
     return false;
 }
 
     return false;
 }
 

+bool AaptGroupEntry::getScreenLayoutSizeName(const char* name,
+                                     ResTable_config* out)
+{
+    if (strcmp(name, kWildcardName) == 0) {
+        if (out) out->screenLayout =
+                (out->screenLayout&~ResTable_config::MASK_SCREENSIZE)
+                | ResTable_config::SCREENSIZE_ANY;
+        return true;
+    } else if (strcmp(name, "small") == 0) {
+        if (out) out->screenLayout =
+                (out->screenLayout&~ResTable_config::MASK_SCREENSIZE)
+                | ResTable_config::SCREENSIZE_SMALL;
+        return true;
+    } else if (strcmp(name, "normal") == 0) {
+        if (out) out->screenLayout =
+                (out->screenLayout&~ResTable_config::MASK_SCREENSIZE)
+                | ResTable_config::SCREENSIZE_NORMAL;
+        return true;
+    } else if (strcmp(name, "large") == 0) {
+        if (out) out->screenLayout =
+                (out->screenLayout&~ResTable_config::MASK_SCREENSIZE)
+                | ResTable_config::SCREENSIZE_LARGE;
+        return true;
+    }
+
+    return false;
+}
+
+bool AaptGroupEntry::getScreenLayoutLongName(const char* name,
+                                     ResTable_config* out)
+{
+    if (strcmp(name, kWildcardName) == 0) {
+        if (out) out->screenLayout =
+                (out->screenLayout&~ResTable_config::MASK_SCREENLONG)
+                | ResTable_config::SCREENLONG_ANY;
+        return true;
+    } else if (strcmp(name, "long") == 0) {
+        if (out) out->screenLayout =
+                (out->screenLayout&~ResTable_config::MASK_SCREENLONG)
+                | ResTable_config::SCREENLONG_YES;
+        return true;
+    } else if (strcmp(name, "notlong") == 0) {
+        if (out) out->screenLayout =
+                (out->screenLayout&~ResTable_config::MASK_SCREENLONG)
+                | ResTable_config::SCREENLONG_NO;
+        return true;
+    }
+
+    return false;
+}
+

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


@@ -621,7 +755,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;
 }
 


@@ -629,9 +763,30 @@ bool AaptGroupEntry::getDensityName(const char* name,
                                     ResTable_config* out)
 {
     if (strcmp(name, kWildcardName) == 0) {
                                     ResTable_config* out)
 {
     if (strcmp(name, kWildcardName) == 0) {

-        if (out) out->density = 0;
+        if (out) out->density = ResTable_config::DENSITY_DEFAULT;
+        return true;
+    }
+    
+    if (strcmp(name, "nodpi") == 0) {
+        if (out) out->density = ResTable_config::DENSITY_NONE;
+        return true;
+    }
+    
+    if (strcmp(name, "ldpi") == 0) {
+        if (out) out->density = ResTable_config::DENSITY_LOW;
+        return true;
+    }
+    
+    if (strcmp(name, "mdpi") == 0) {
+        if (out) out->density = ResTable_config::DENSITY_MEDIUM;
+        return true;
+    }
+    
+    if (strcmp(name, "hdpi") == 0) {
+        if (out) out->density = ResTable_config::DENSITY_HIGH;

         return true;
     }
         return true;
     }

+    

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


@@ -677,7 +832,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;
 }
 


@@ -699,12 +854,12 @@ bool AaptGroupEntry::getKeysHiddenName(const char* name,
         mask = out->MASK_KEYSHIDDEN;
         value = out->KEYSHIDDEN_SOFT;
     }
         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;
 }
 


@@ -724,7 +879,31 @@ 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;
+}
+
+bool AaptGroupEntry::getNavHiddenName(const char* name,
+                                       ResTable_config* out)
+{
+    uint8_t mask = 0;
+    uint8_t value = 0;
+    if (strcmp(name, kWildcardName) == 0) {
+        mask = out->MASK_NAVHIDDEN;
+        value = out->NAVHIDDEN_ANY;
+    } else if (strcmp(name, "navexposed") == 0) {
+        mask = out->MASK_NAVHIDDEN;
+        value = out->NAVHIDDEN_NO;
+    } else if (strcmp(name, "navhidden") == 0) {
+        mask = out->MASK_NAVHIDDEN;
+        value = out->NAVHIDDEN_YES;
+    }
+
+    if (mask != 0) {
+        if (out) out->inputFlags = (out->inputFlags&~mask) | value;
+        return true;
+    }
+

     return false;
 }
 
     return false;
 }
 


@@ -747,7 +926,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;
 }
 


@@ -761,29 +940,29 @@ 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;
 }
 


@@ -797,22 +976,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;
 }
 


@@ -822,11 +1001,14 @@ int AaptGroupEntry::compare(const AaptGroupEntry& o) const
     if (v == 0) v = mnc.compare(o.mnc);
     if (v == 0) v = locale.compare(o.locale);
     if (v == 0) v = vendor.compare(o.vendor);
     if (v == 0) v = mnc.compare(o.mnc);
     if (v == 0) v = locale.compare(o.locale);
     if (v == 0) v = vendor.compare(o.vendor);

+    if (v == 0) v = screenLayoutSize.compare(o.screenLayoutSize);
+    if (v == 0) v = screenLayoutLong.compare(o.screenLayoutLong);

     if (v == 0) v = orientation.compare(o.orientation);
     if (v == 0) v = density.compare(o.density);
     if (v == 0) v = touchscreen.compare(o.touchscreen);
     if (v == 0) v = keysHidden.compare(o.keysHidden);
     if (v == 0) v = keyboard.compare(o.keyboard);
     if (v == 0) v = orientation.compare(o.orientation);
     if (v == 0) v = density.compare(o.density);
     if (v == 0) v = touchscreen.compare(o.touchscreen);
     if (v == 0) v = keysHidden.compare(o.keysHidden);
     if (v == 0) v = keyboard.compare(o.keyboard);

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

     if (v == 0) v = navigation.compare(o.navigation);
     if (v == 0) v = screenSize.compare(o.screenSize);
     if (v == 0) v = version.compare(o.version);
     if (v == 0) v = navigation.compare(o.navigation);
     if (v == 0) v = screenSize.compare(o.screenSize);
     if (v == 0) v = version.compare(o.version);


@@ -840,11 +1022,14 @@ ResTable_config AaptGroupEntry::toParams() const
     getMccName(mcc.string(), &params);
     getMncName(mnc.string(), &params);
     getLocaleName(locale.string(), &params);
     getMccName(mcc.string(), &params);
     getMncName(mnc.string(), &params);
     getLocaleName(locale.string(), &params);

+    getScreenLayoutSizeName(screenLayoutSize.string(), &params);
+    getScreenLayoutLongName(screenLayoutLong.string(), &params);

     getOrientationName(orientation.string(), &params);
     getDensityName(density.string(), &params);
     getTouchscreenName(touchscreen.string(), &params);
     getKeysHiddenName(keysHidden.string(), &params);
     getKeyboardName(keyboard.string(), &params);
     getOrientationName(orientation.string(), &params);
     getDensityName(density.string(), &params);
     getTouchscreenName(touchscreen.string(), &params);
     getKeysHiddenName(keysHidden.string(), &params);
     getKeyboardName(keyboard.string(), &params);

+    getNavHiddenName(navHidden.string(), &params);

     getNavigationName(navigation.string(), &params);
     getScreenSizeName(screenSize.string(), &params);
     getVersionName(version.string(), &params);
     getNavigationName(navigation.string(), &params);
     getScreenSizeName(screenSize.string(), &params);
     getVersionName(version.string(), &params);


@@ -1081,29 +1266,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);
     }
 


@@ -1315,7 +1500,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);
 }
 


@@ -1324,10 +1509,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();
 


@@ -1380,28 +1565,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.
      */


@@ -1684,6 +1876,19 @@ void AaptAssets::print() const
     AaptDir::print();
 }
 
     AaptDir::print();
 }
 

+sp<AaptDir> AaptAssets::resDir(const String8& name)
+{
+    const Vector<sp<AaptDir> >& dirs = mDirs;
+    const size_t N = dirs.size();
+    for (size_t i=0; i<N; i++) {
+        const sp<AaptDir>& d = dirs.itemAt(i);
+        if (d->getLeaf() == name) {
+            return d;
+        }
+    }
+    return NULL;
+}
+

 bool
 valid_symbol_name(const String8& symbol)
 {
 bool
 valid_symbol_name(const String8& symbol)
 {