commit 4a223cdde591b5f3000a3de071d41c833a387578
author Ying Wang <wangying@google.com> Mon Mar 14 15:53:23 2011 -0700
committer Ying Wang <wangying@google.com> Mon Mar 14 15:53:23 2011 -0700
tree 5fa0b13bd0218f9250b4901cc7e1ccc28f856e61
parent 6f3a75e13b86a3f40fe34e3ebd17b118791a73a4

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

So that we can add screen layout size such as
"small/normal/large/xlarge" to PRODUCT_LOCALES to filter unwanted
resources. We already handle screen density this way.
Bug: 4086309

Change-Id: I0867e22a825faea0e100d8a0075f0f5cb7c0c964

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;
     }