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

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 6bc1ee6cbfbc5bd67197fefbec19deeca3b4d6e3..14cad2f0b8b9c461a8614db34511d2e064de9d78 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -187,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;


@@ -202,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;


@@ -378,6 +385,18 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType)
         //printf("not screen size: %s\n", part.string());
     }
 
         //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;
 


@@ -404,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?


@@ -435,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;
 }


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


@@ -628,9 +654,15 @@ 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;
     }
         return true;
     }

+    
+    if (strcmp(name, "nodpi") == 0) {
+        if (out) out->density = ResTable_config::DENSITY_NONE;
+        return true;
+    }
+    

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


@@ -786,6 +818,26 @@ 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)
 {


@@ -828,6 +880,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;
 }


@@ -846,6 +899,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;
 }