summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRamanan Rajeswaran <ramanan@google.com>2012-02-13 14:22:44 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-13 14:22:44 -0800
commit8046e294c545b8e3712bff7925b024639936d5bf (patch)
tree45a0eb7dc22940877a340d3ac937dfed02048ff8 /tools
parenteb56ad183af8a9833ff22a22b97f174f05266c58 (diff)
parent9d29031417bd2256a287969271edcd57c0cbd9c2 (diff)
downloadframeworks_base-8046e294c545b8e3712bff7925b024639936d5bf.zip
frameworks_base-8046e294c545b8e3712bff7925b024639936d5bf.tar.gz
frameworks_base-8046e294c545b8e3712bff7925b024639936d5bf.tar.bz2
Merge "DO NOT MERGE" into ics-scoop
Diffstat (limited to 'tools')
-rw-r--r--tools/aapt/AaptAssets.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index 7900ab7..3d6537a 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -1079,17 +1079,12 @@ bool AaptGroupEntry::getDensityName(const char* name,
if (out) out->density = ResTable_config::DENSITY_HIGH;
return true;
}
-
+
if (strcmp(name, "xhdpi") == 0) {
- if (out) out->density = ResTable_config::DENSITY_XHIGH;
+ if (out) out->density = ResTable_config::DENSITY_MEDIUM*2;
return true;
}
-
- if (strcmp(name, "xxhdpi") == 0) {
- if (out) out->density = ResTable_config::DENSITY_XXHIGH;
- return true;
- }
-
+
char* c = (char*)name;
while (*c >= '0' && *c <= '9') {
c++;