summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-06-06 12:13:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-06 12:13:59 -0700
commit8443e93fa2b2332fd92b4b0c061e69b5b22106d6 (patch)
treef560dc15cb31ad51b5a80ec9a87f7045ff0881ff /tools
parent05fefe62eedda9a694aee056ef34e0a01288fd58 (diff)
parentfc15bd94b01f801065f1ad1092f7580bbd803829 (diff)
downloadframeworks_base-8443e93fa2b2332fd92b4b0c061e69b5b22106d6.zip
frameworks_base-8443e93fa2b2332fd92b4b0c061e69b5b22106d6.tar.gz
frameworks_base-8443e93fa2b2332fd92b4b0c061e69b5b22106d6.tar.bz2
am fc15bd94: am 168585ed: am 5474902f: Merge "xhdpi" into froyo
Diffstat (limited to 'tools')
-rw-r--r--tools/aapt/AaptAssets.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 4d2d046..d6cfb12 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -893,6 +893,11 @@ bool AaptGroupEntry::getDensityName(const char* name,
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++;