summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-01-25 15:12:23 -0800
committerDianne Hackborn <hackbod@google.com>2012-01-25 15:14:50 -0800
commitd96e3dfa02b203b1fc826e80d6f9aa074ba9c250 (patch)
treea91a318c43620b6523bd2e83be01632f223b153c /tools
parent43ea4e10dc402d20f506cdb4b4f27e49b4dc0443 (diff)
downloadframeworks_base-d96e3dfa02b203b1fc826e80d6f9aa074ba9c250.zip
frameworks_base-d96e3dfa02b203b1fc826e80d6f9aa074ba9c250.tar.gz
frameworks_base-d96e3dfa02b203b1fc826e80d6f9aa074ba9c250.tar.bz2
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Diffstat (limited to 'tools')
-rw-r--r--tools/aapt/AaptAssets.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp
index f0c215e..6ce665b 100644
--- a/tools/aapt/AaptAssets.cpp
+++ b/tools/aapt/AaptAssets.cpp
@@ -1084,12 +1084,17 @@ 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_MEDIUM*2;
+ if (out) out->density = ResTable_config::DENSITY_XHIGH;
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++;