From: Android (Google) Code Review Date: Wed, 22 Jul 2009 02:03:53 +0000 (-0700) Subject: am 9fc20b0e: Merge change 8126 into donut X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/9a85f8dc1a692abb68293f2586cfc5b35979f92a?hp=20c58838b49685f6a28c65445783412796938508 am 9fc20b0e: Merge change 8126 into donut Merge commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf' * commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf': First pass at reworking screen density/size APIs. --- diff --git a/AaptAssets.cpp b/AaptAssets.cpp index 14cad2f..dbcef6d 100644 --- a/AaptAssets.cpp +++ b/AaptAssets.cpp @@ -138,6 +138,20 @@ AaptGroupEntry::parseNamePart(const String8& part, int* axis, uint32_t* value) 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; @@ -187,13 +201,6 @@ AaptGroupEntry::parseNamePart(const String8& part, int* axis, uint32_t* value) 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; @@ -209,7 +216,8 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType) { Vector 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, size, vers; const char *p = dir; const char *q; @@ -296,6 +304,30 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType) //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; @@ -385,18 +417,6 @@ AaptGroupEntry::initFromDirName(const char* dir, String8* resType) //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; @@ -416,6 +436,8 @@ success: this->mcc = mcc; this->mnc = mnc; this->locale = loc; + this->screenLayoutSize = layoutsize; + this->screenLayoutLong = layoutlong; this->orientation = orient; this->density = den; this->touchscreen = touch; @@ -423,7 +445,6 @@ success: this->keyboard = key; this->navigation = nav; this->screenSize = size; - this->screenLayout = layout; this->version = vers; // what is this anyway? @@ -441,6 +462,10 @@ AaptGroupEntry::toString() const s += ","; s += this->locale; s += ","; + s += screenLayoutSize; + s += ","; + s += screenLayoutLong; + s += ","; s += this->orientation; s += ","; s += density; @@ -455,8 +480,6 @@ AaptGroupEntry::toString() const s += ","; s += screenSize; s += ","; - s += screenLayout; - s += ","; s += version; return s; } @@ -477,6 +500,14 @@ AaptGroupEntry::toDirName(const String8& resType) const s += "-"; s += locale; } + if (this->screenLayoutSize != "") { + s += "-"; + s += screenLayoutSize; + } + if (this->screenLayoutLong != "") { + s += "-"; + s += screenLayoutLong; + } if (this->orientation != "") { s += "-"; s += orientation; @@ -505,10 +536,6 @@ AaptGroupEntry::toDirName(const String8& resType) const s += "-"; s += screenSize; } - if (this->screenLayout != "") { - s += "-"; - s += screenLayout; - } if (this->version != "") { s += "-"; s += version; @@ -630,6 +657,57 @@ bool AaptGroupEntry::getLocaleName(const char* fileName, 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) { @@ -663,6 +741,21 @@ bool AaptGroupEntry::getDensityName(const char* name, 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; + } + char* c = (char*)name; while (*c >= '0' && *c <= '9') { c++; @@ -818,26 +911,6 @@ bool AaptGroupEntry::getScreenSizeName(const char* name, 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) { @@ -873,6 +946,8 @@ 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 = 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); @@ -880,7 +955,6 @@ 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 = screenLayout.compare(o.screenLayout); if (v == 0) v = version.compare(o.version); return v; } @@ -892,6 +966,8 @@ ResTable_config AaptGroupEntry::toParams() const getMccName(mcc.string(), ¶ms); getMncName(mnc.string(), ¶ms); getLocaleName(locale.string(), ¶ms); + getScreenLayoutSizeName(screenLayoutSize.string(), ¶ms); + getScreenLayoutLongName(screenLayoutLong.string(), ¶ms); getOrientationName(orientation.string(), ¶ms); getDensityName(density.string(), ¶ms); getTouchscreenName(touchscreen.string(), ¶ms); @@ -899,7 +975,6 @@ ResTable_config AaptGroupEntry::toParams() const getKeyboardName(keyboard.string(), ¶ms); getNavigationName(navigation.string(), ¶ms); getScreenSizeName(screenSize.string(), ¶ms); - getScreenLayoutName(screenLayout.string(), ¶ms); getVersionName(version.string(), ¶ms); return params; } diff --git a/AaptAssets.h b/AaptAssets.h index e8c7395..5724349 100644 --- a/AaptAssets.h +++ b/AaptAssets.h @@ -30,6 +30,8 @@ enum { AXIS_MNC, AXIS_LANGUAGE, AXIS_REGION, + AXIS_SCREENLAYOUTSIZE, + AXIS_SCREENLAYOUTLONG, AXIS_ORIENTATION, AXIS_DENSITY, AXIS_TOUCHSCREEN, @@ -37,7 +39,6 @@ enum { AXIS_KEYBOARD, AXIS_NAVIGATION, AXIS_SCREENSIZE, - AXIS_SCREENLAYOUT, AXIS_VERSION }; @@ -56,6 +57,8 @@ public: String8 mnc; String8 locale; String8 vendor; + String8 screenLayoutSize; + String8 screenLayoutLong; String8 orientation; String8 density; String8 touchscreen; @@ -63,7 +66,6 @@ public: String8 keyboard; String8 navigation; String8 screenSize; - String8 screenLayout; String8 version; bool initFromDirName(const char* dir, String8* resType); @@ -73,6 +75,8 @@ public: static bool getMccName(const char* name, ResTable_config* out = NULL); static bool getMncName(const char* name, ResTable_config* out = NULL); static bool getLocaleName(const char* name, ResTable_config* out = NULL); + static bool getScreenLayoutSizeName(const char* name, ResTable_config* out = NULL); + static bool getScreenLayoutLongName(const char* name, ResTable_config* out = NULL); static bool getOrientationName(const char* name, ResTable_config* out = NULL); static bool getDensityName(const char* name, ResTable_config* out = NULL); static bool getTouchscreenName(const char* name, ResTable_config* out = NULL); @@ -80,7 +84,6 @@ public: static bool getKeyboardName(const char* name, ResTable_config* out = NULL); static bool getNavigationName(const char* name, ResTable_config* out = NULL); static bool getScreenSizeName(const char* name, ResTable_config* out = NULL); - static bool getScreenLayoutName(const char* name, ResTable_config* out = NULL); static bool getVersionName(const char* name, ResTable_config* out = NULL); int compare(const AaptGroupEntry& o) const;