am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics...

Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken

* commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
  Adding the backward-compatible filtering heuristics for the new device

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index fc655a7abbb7e966d537fe1c56e9fe10d7146943..4d2d046bd921eb5198841179968bbc2c6f1e2aed 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -766,6 +766,11 @@ bool AaptGroupEntry::getScreenLayoutSizeName(const char* name,
                 (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;