diff options
| author | Bryan Mawhinney <bryanmawhinney@google.com> | 2014-06-09 15:55:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 15:55:43 +0000 |
| commit | aa00ae0a67059c305323d234cf9ffb0cf9a15961 (patch) | |
| tree | 9ebdbc6088a94bbdc8f2f51f4c892d04c4f300eb /tools | |
| parent | 75814c19d33d8f206e7b1113d15fe4ae9f2a7c26 (diff) | |
| parent | 2386bd5de40849bd312482e33105070cf438011d (diff) | |
| download | frameworks_base-aa00ae0a67059c305323d234cf9ffb0cf9a15961.zip frameworks_base-aa00ae0a67059c305323d234cf9ffb0cf9a15961.tar.gz frameworks_base-aa00ae0a67059c305323d234cf9ffb0cf9a15961.tar.bz2 | |
am 99017c01: Merge "Fix issue preventing aapt from stripping all unwanted densities" into lmp-preview-dev
* commit '99017c01bac525ca4b5b10768052ced398b4a493':
Fix issue preventing aapt from stripping all unwanted densities
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 12d5389..2028ff4 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -1457,9 +1457,9 @@ status_t AaptAssets::filter(Bundle* bundle) if (AaptConfig::isSameExcept(config, mconfig, ResTable_config::CONFIG_DENSITY)) { // See if there is a better density resource if (mconfig.density < bestDensity && - mconfig.density > preferredDensity && + mconfig.density >= preferredDensity && bestDensity > preferredDensity) { - // This density is between our best density and + // This density is our preferred density, or between our best density and // the preferred density, therefore it is better. bestDensity = mconfig.density; } else if (mconfig.density > bestDensity && |