am 5474902f: Merge "xhdpi" into froyo

Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi

diff --combined AaptAssets.cpp
index 4d2d046bd921eb5198841179968bbc2c6f1e2aed,efc961998e6b9c902da1694fe7d7cd906be5cd0f..d6cfb12d0b973d053076a29e3f7c6f2f3e13a4e7
--- 1/AaptAssets.cpp
--- 2/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@@ -766,11 -766,6 +766,11 @@@ bool AaptGroupEntry::getScreenLayoutSiz
                  (out->screenLayout&~ResTable_config::MASK_SCREENSIZE)
                  | ResTable_config::SCREENSIZE_LARGE;
          return true;
 +    } else if (strcmp(name, "xlarge") == 0) {
 +        if (out) out->screenLayout =
 +                (out->screenLayout&~ResTable_config::MASK_SCREENSIZE)
 +                | ResTable_config::SCREENSIZE_XLARGE;
 +        return true;
      }
  
      return false;
@@@ -893,6 -888,11 +893,11 @@@ bool AaptGroupEntry::getDensityName(con
          return true;
      }
      
+     if (strcmp(name, "xhdpi") == 0) {
+         if (out) out->density = ResTable_config::DENSITY_MEDIUM*2;
+         return true;
+     }
+     
      char* c = (char*)name;
      while (*c >= '0' && *c <= '9') {
          c++;