From: Dianne Hackborn <hackbod@google.com>
Date: Fri, 20 May 2011 02:34:21 +0000 (-0700)
Subject: am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/57eb8d8693135a33a186fad3a4c854b5c13337fb?ds=inline;hp=-c

am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.

* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
  Add new "-swNNNdp" resource qualifier.
---

57eb8d8693135a33a186fad3a4c854b5c13337fb
diff --combined ResourceTable.cpp
index a88476e,68c3892..5c5b4fd
--- a/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@@ -2607,6 -2607,9 +2607,9 @@@ ResourceFilter::match(const ResTable_co
      if (!match(AXIS_SCREENSIZE, config.screenSize)) {
          return false;
      }
+     if (!match(AXIS_SMALLESTSCREENWIDTHDP, config.smallestScreenWidthDp)) {
+         return false;
+     }
      if (!match(AXIS_SCREENWIDTHDP, config.screenWidthDp)) {
          return false;
      }
@@@ -2809,7 -2812,8 +2812,8 @@@ status_t ResourceTable::flatten(Bundle
                  ConfigDescription config = t->getUniqueConfigs().itemAt(ci);
  
                  NOISY(printf("Writing config %d config: imsi:%d/%d lang:%c%c cnt:%c%c "
-                      "orien:%d ui:%d touch:%d density:%d key:%d inp:%d nav:%d sz:%dx%d %ddp x %ddp\n",
+                      "orien:%d ui:%d touch:%d density:%d key:%d inp:%d nav:%d sz:%dx%d "
+                      "sw%ddp w%ddp h%ddp\n",
                        ti+1,
                        config.mcc, config.mnc,
                        config.language[0] ? config.language[0] : '-',
@@@ -2825,6 -2829,7 +2829,7 @@@
                        config.navigation,
                        config.screenWidth,
                        config.screenHeight,
+                       config.smallestScreenWidthDp,
                        config.screenWidthDp,
                        config.screenHeightDp));
                        
@@@ -2849,7 -2854,8 +2854,8 @@@
                  tHeader->entriesStart = htodl(typeSize);
                  tHeader->config = config;
                  NOISY(printf("Writing type %d config: imsi:%d/%d lang:%c%c cnt:%c%c "
-                      "orien:%d ui:%d touch:%d density:%d key:%d inp:%d nav:%d sz:%dx%d %ddp x %ddp\n",
+                      "orien:%d ui:%d touch:%d density:%d key:%d inp:%d nav:%d sz:%dx%d "
+                      "sw%ddp w%ddp h%ddp\n",
                        ti+1,
                        tHeader->config.mcc, tHeader->config.mnc,
                        tHeader->config.language[0] ? tHeader->config.language[0] : '-',
@@@ -2865,6 -2871,7 +2871,7 @@@
                        tHeader->config.navigation,
                        tHeader->config.screenWidth,
                        tHeader->config.screenHeight,
+                       tHeader->config.smallestScreenWidthDp,
                        tHeader->config.screenWidthDp,
                        tHeader->config.screenHeightDp));
                  tHeader->config.swapHtoD();
@@@ -3448,7 -3455,8 +3455,8 @@@ sp<ResourceTable::Entry> ResourceTable:
      if (e == NULL) {
          if (config != NULL) {
              NOISY(printf("New entry at %s:%d: imsi:%d/%d lang:%c%c cnt:%c%c "
-                     "orien:%d touch:%d density:%d key:%d inp:%d nav:%d sz:%dx%d %ddp x %ddp\n",
+                     "orien:%d touch:%d density:%d key:%d inp:%d nav:%d sz:%dx%d "
+                     "sw%ddp w%ddp h%ddp\n",
                        sourcePos.file.string(), sourcePos.line,
                        config->mcc, config->mnc,
                        config->language[0] ? config->language[0] : '-',
@@@ -3463,6 -3471,7 +3471,7 @@@
                        config->navigation,
                        config->screenWidth,
                        config->screenHeight,
+                       config->smallestScreenWidthDp,
                        config->screenWidthDp,
                        config->screenHeightDp));
          } else {
@@@ -3696,9 -3705,7 +3705,9 @@@ sp<ResourceTable::Package> ResourceTabl
  {
      sp<Package> p = mPackages.valueFor(package);
      if (p == NULL) {
 -        if (mIsAppPackage) {
 +        if (mBundle->getIsOverlayPackage()) {
 +            p = new Package(package, 0x00);
 +        } else if (mIsAppPackage) {
              if (mHaveAppPackage) {
                  fprintf(stderr, "Adding multiple application package resources; only one is allowed.\n"
                                  "Use -x to create extended resources.\n");