am 7fc39b26: Merge change 25238 into eclair

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 67af116d372dc5e67dff6bc01cba8e13d053fb2e..b6b0e63f19aa67570482bee5c011f469f02c519e 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -138,6 +138,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;


@@ -173,6 +187,13 @@ AaptGroupEntry::parseNamePart(const String8& part, int* axis, uint32_t* value)
         return 0;
     }
 
         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;
     // navigation
     if (getNavigationName(part.string(), &config)) {
         *axis = AXIS_NAVIGATION;


@@ -187,13 +208,6 @@ 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;


@@ -209,7 +223,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, layout, 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;


@@ -296,6 +311,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;


@@ -361,8 +400,9 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
         //printf("not keyboard: %s\n", part.string());
     }
 
         //printf("not keyboard: %s\n", part.string());
     }
 

-    if (getNavigationName(part.string())) {
-        nav = part;
+    // navigation hidden
+    if (getNavHiddenName(part.string())) {
+        navHidden = part;

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


@@ -370,11 +410,11 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
         }
         part = parts[index];
     } else {
         }
         part = parts[index];
     } else {

-        //printf("not navigation: %s\n", part.string());
+        //printf("not navHidden: %s\n", part.string());

     }
 
     }
 

-    if (getScreenSizeName(part.string())) {
-        size = part;
+    if (getNavigationName(part.string())) {
+        nav = part;

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


@@ -382,11 +422,11 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
         }
         part = parts[index];
     } else {
         }
         part = parts[index];
     } else {

-        //printf("not screen size: %s\n", part.string());
+        //printf("not navigation: %s\n", part.string());

     }
 
     }
 

-    if (getScreenLayoutName(part.string())) {
-        layout = part;
+    if (getScreenSizeName(part.string())) {
+        size = part;

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


@@ -394,7 +434,7 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
         }
         part = parts[index];
     } else {
         }
         part = parts[index];
     } else {

-        //printf("not screen layout: %s\n", part.string());
+        //printf("not screen size: %s\n", part.string());

     }
 
     if (getVersionName(part.string())) {
     }
 
     if (getVersionName(part.string())) {


@@ -416,14 +456,16 @@ 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->navigation = nav;
     this->screenSize = size;

-    this->screenLayout = layout;

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


@@ -441,6 +483,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;


@@ -451,12 +497,12 @@ AaptGroupEntry::toString() const
     s += ",";
     s += keyboard;
     s += ",";
     s += ",";
     s += keyboard;
     s += ",";

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

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

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

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


@@ -477,6 +523,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;


@@ -497,6 +551,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;


@@ -505,10 +563,6 @@ 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;


@@ -630,6 +684,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)
 {


@@ -654,9 +759,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;
     }
         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;
+    }
+    

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


@@ -753,6 +879,30 @@ bool AaptGroupEntry::getKeyboardName(const char* name,
     return false;
 }
 
     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;
+}
+

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


@@ -812,26 +962,6 @@ bool AaptGroupEntry::getScreenSizeName(const char* name,
     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)
 {


@@ -867,14 +997,16 @@ 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 = 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;
 }


@@ -886,14 +1018,16 @@ 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);
     getNavigationName(navigation.string(), &params);
     getScreenSizeName(screenSize.string(), &params);

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

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


@@ -1738,6 +1872,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)
 {