diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-10-17 20:28:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 20:28:47 +0000 |
| commit | 7dd87312c9e9ee52c7c945785c6d3b274b3004b3 (patch) | |
| tree | 85f91fbd14d28123d5d0885f389484ec2d6f047e /tools/aapt | |
| parent | 50207f043f8fd2e39173956c9b4ee52fe775e115 (diff) | |
| parent | 87a529c899045cf2785b86e4e289dd6c6cf56c1a (diff) | |
| download | frameworks_base-7dd87312c9e9ee52c7c945785c6d3b274b3004b3.zip frameworks_base-7dd87312c9e9ee52c7c945785c6d3b274b3004b3.tar.gz frameworks_base-7dd87312c9e9ee52c7c945785c6d3b274b3004b3.tar.bz2 | |
am 87a529c8: am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev
* commit '87a529c899045cf2785b86e4e289dd6c6cf56c1a':
Minor resource notation/compatibility fixes
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) { |