commit a738a7d9816248ceafafe3404cd41ba6a4abd09f
author Ying Wang <wangying@google.com> Mon Mar 14 19:20:00 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 14 19:20:00 2011 -0700
tree a6ca6d3ed14ffe69311d928f5b4b9bcf51b17220
parent 75a1ef8d14de25850a171ee80fc7f9a5b70611b5
parent 4a223cdde591b5f3000a3de071d41c833a387578

Merge "Add screen layout size as one of the resource filtering axes."

tools/aapt/ResourceTable.cpp

diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index 5339566..10815a1 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -2607,6 +2607,9 @@
     if (!match(AXIS_SCREENSIZE, config.screenSize)) {
         return false;
     }
+    if (!match(AXIS_SCREENLAYOUTSIZE, config.screenLayout&ResTable_config::MASK_SCREENSIZE)) {
+        return false;
+    }
     if (!match(AXIS_VERSION, config.version)) {
         return false;
     }