diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-12-13 12:35:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-13 12:35:14 -0800 |
| commit | 7345f24ff83fe647d75e3aed73e21a4569f90b32 (patch) | |
| tree | baf255976d623adae35bb9e3046976efe387e2c0 /libs | |
| parent | 33b7978cf4ac280581108a88edc013a7b32d5112 (diff) | |
| parent | 5780e196806b3741786b212866435593990f97ee (diff) | |
| download | frameworks_base-7345f24ff83fe647d75e3aed73e21a4569f90b32.zip frameworks_base-7345f24ff83fe647d75e3aed73e21a4569f90b32.tar.gz frameworks_base-7345f24ff83fe647d75e3aed73e21a4569f90b32.tar.bz2 | |
am 5780e196: am 5c0d6f99: am 9de88dad: Merge "Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale" into jb-mr1.1-dev
* commit '5780e196806b3741786b212866435593990f97ee':
Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index fc2cd9e..a730065 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -1530,7 +1530,8 @@ int ResTable_config::diff(const ResTable_config& o) const { if (navigation != o.navigation) diffs |= CONFIG_NAVIGATION; if (screenSize != o.screenSize) diffs |= CONFIG_SCREEN_SIZE; if (version != o.version) diffs |= CONFIG_VERSION; - if (screenLayout != o.screenLayout) diffs |= CONFIG_SCREEN_LAYOUT; + if ((screenLayout & MASK_LAYOUTDIR) != (o.screenLayout & MASK_LAYOUTDIR)) diffs |= CONFIG_LAYOUTDIR; + if ((screenLayout & ~MASK_LAYOUTDIR) != (o.screenLayout & ~MASK_LAYOUTDIR)) diffs |= CONFIG_SCREEN_LAYOUT; if (uiMode != o.uiMode) diffs |= CONFIG_UI_MODE; if (smallestScreenWidthDp != o.smallestScreenWidthDp) diffs |= CONFIG_SMALLEST_SCREEN_SIZE; if (screenSizeDp != o.screenSizeDp) diffs |= CONFIG_SCREEN_SIZE; |