diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-16 18:18:10 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-10-17 01:21:50 +0000 |
| commit | 9086562a6a524cc0c96231411863cd65d8785bfe (patch) | |
| tree | 8227f89264ebc5c599813ccbeec3b0f96fcd45b7 /tools/aapt | |
| parent | df385fffe822a7854fb7ce9c5e46ee007646c89e (diff) | |
| download | frameworks_base-9086562a6a524cc0c96231411863cd65d8785bfe.zip frameworks_base-9086562a6a524cc0c96231411863cd65d8785bfe.tar.gz frameworks_base-9086562a6a524cc0c96231411863cd65d8785bfe.tar.bz2 | |
Minor resource notation/compatibility fixes
- Change the format of mnc/mcc when printing a resource-qualifier
formatted string from a Configuration object.
- Correctly bump the SDK to 21 when using anydpi in a resource qualifier.
Change-Id: I3c31e344dc5384d45398d6e9f264a073abab65d1
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/AaptConfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/AaptConfig.cpp b/tools/aapt/AaptConfig.cpp index 32a0cd3..f447462 100644 --- a/tools/aapt/AaptConfig.cpp +++ b/tools/aapt/AaptConfig.cpp @@ -240,7 +240,9 @@ void applyVersionForCompatibility(ConfigDescription* config) { } uint16_t minSdk = 0; - if (config->smallestScreenWidthDp != ResTable_config::SCREENWIDTH_ANY + if (config->density == ResTable_config::DENSITY_ANY) { + minSdk = SDK_L; + } else if (config->smallestScreenWidthDp != ResTable_config::SCREENWIDTH_ANY || config->screenWidthDp != ResTable_config::SCREENWIDTH_ANY || config->screenHeightDp != ResTable_config::SCREENHEIGHT_ANY) { minSdk = SDK_HONEYCOMB_MR2; @@ -255,8 +257,6 @@ void applyVersionForCompatibility(ConfigDescription* config) { != ResTable_config::SCREENLONG_ANY || config->density != ResTable_config::DENSITY_DEFAULT) { minSdk = SDK_DONUT; - } else if ((config->density == ResTable_config::DENSITY_ANY)) { - minSdk = SDK_L; } if (minSdk > config->sdkVersion) { |