From: Dianne Hackborn <hackbod@google.com>
Date: Sun, 6 Jun 2010 19:10:05 +0000 (-0700)
Subject: am 5474902f: Merge "xhdpi" into froyo
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/3152b91241261222e0589353966d328275abcce2?hp=-c

am 5474902f: Merge "xhdpi" into froyo

Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi
---

3152b91241261222e0589353966d328275abcce2
diff --combined AaptAssets.cpp
index 4d2d046,efc9619..d6cfb12
--- a/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++;