From: Ying Wang <wangying@google.com>
Date: Mon, 14 Mar 2011 22:53:23 +0000 (-0700)
Subject: Add screen layout size as one of the resource filtering axes.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/54a6bb872d4c503ec83c92f93f92c8d406f91ff3

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

diff --git a/ResourceTable.cpp b/ResourceTable.cpp
index 5339566..10815a1 100644
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@ -2607,6 +2607,9 @@ ResourceFilter::match(const ResTable_config& config) const
     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;
     }