Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue preventing aapt from stripping all unwanted densities" into lmp-preview-dev

Browse Source
This commit is contained in:
Bryan Mawhinney
2014-06-08 17:03:02 +00:00
committed by Android (Google) Code Review
parent acb119f0a2 b0db8de73e
commit 2386bd5de4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt/AaptAssets.cpp
View File

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