diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-01-23 02:29:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-23 02:29:50 +0000 |
| commit | b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43 (patch) | |
| tree | 643ecc7fde5e111328b12339990077e39209b3f7 | |
| parent | 7fde5e5ba3d306bc694e2b97edf5892755fcb6d0 (diff) | |
| parent | ed643e81827797bd22069bf4283348d49fded891 (diff) | |
| download | frameworks_base-b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43.zip frameworks_base-b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43.tar.gz frameworks_base-b443610bcb9a1f0d8e64b55c7d6e53bc54d7ec43.tar.bz2 | |
Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev
| -rw-r--r-- | tools/aapt/AaptConfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/AaptConfig.cpp b/tools/aapt/AaptConfig.cpp index e88c27a..ede9e99 100644 --- a/tools/aapt/AaptConfig.cpp +++ b/tools/aapt/AaptConfig.cpp @@ -796,7 +796,7 @@ bool isSameExcept(const ResTable_config& a, const ResTable_config& b, int axisMa } bool isDensityOnly(const ResTable_config& config) { - if (config.density == ResTable_config::DENSITY_NONE) { + if (config.density == ResTable_config::DENSITY_DEFAULT) { return false; } |