]> git.saurik.com Git - android/aapt.git/commitdiff
am 8046e294: Merge "DO NOT MERGE" into ics-scoop
authorRamanan Rajeswaran <ramanan@google.com>
Mon, 13 Feb 2012 22:24:38 +0000 (14:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Feb 2012 22:24:38 +0000 (14:24 -0800)
* commit '8046e294c545b8e3712bff7925b024639936d5bf':
  DO NOT MERGE

AaptAssets.cpp

index 7900ab7aea6d2407edd602bf0194982549c0c5f7..3d6537a9013e41725bbeb4cfe2cca31a353973dc 100644 (file)
@@ -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++;