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

am 1beff478: Merge "Fix Configuration layout direction comparison." into klp-dev

Browse Source 
* commit '1beff4787110b92bea5b5c6c8cf67a757a2f0565':
  Fix Configuration layout direction comparison.
This commit is contained in:
Craig Mautner
2013-08-13 12:41:41 -07:00
committed by Android Git Automerger
parent 820726d7c6 1beff47871
commit 92b0673b60
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/content/res/Configuration.java
View File

@@ -786,9 +786,11 @@ public final class Configuration implements Parcelable, Comparable<Configuration
// 2 most significant bits in screenLayout). // 2 most significant bits in screenLayout).
setLayoutDirection(locale); setLayoutDirection(locale);
} }
if (delta.screenLayout != 0 && screenLayout != delta.screenLayout) { final int deltaScreenLayoutDir = delta.screenLayout & SCREENLAYOUT_LAYOUTDIR_MASK;
if (deltaScreenLayoutDir != SCREENLAYOUT_LAYOUTDIR_UNDEFINED &&
deltaScreenLayoutDir != (screenLayout & SCREENLAYOUT_LAYOUTDIR_MASK)) {
screenLayout = (screenLayout & ~SCREENLAYOUT_LAYOUTDIR_MASK) | deltaScreenLayoutDir;
changed |= ActivityInfo.CONFIG_LAYOUT_DIRECTION; changed |= ActivityInfo.CONFIG_LAYOUT_DIRECTION;
setLayoutDirection(locale);
} }
if (delta.userSetLocale && (!userSetLocale || ((changed & ActivityInfo.CONFIG_LOCALE) != 0))) if (delta.userSetLocale && (!userSetLocale || ((changed & ActivityInfo.CONFIG_LOCALE) != 0)))
{ {
@@ -937,7 +939,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration
changed |= ActivityInfo.CONFIG_LOCALE; changed |= ActivityInfo.CONFIG_LOCALE;
changed |= ActivityInfo.CONFIG_LAYOUT_DIRECTION; changed |= ActivityInfo.CONFIG_LAYOUT_DIRECTION;
} }
if (delta.screenLayout != 0 && screenLayout != delta.screenLayout) { final int deltaScreenLayoutDir = delta.screenLayout & SCREENLAYOUT_LAYOUTDIR_MASK;
if (deltaScreenLayoutDir != SCREENLAYOUT_LAYOUTDIR_UNDEFINED &&
deltaScreenLayoutDir != (screenLayout & SCREENLAYOUT_LAYOUTDIR_MASK)) {
changed |= ActivityInfo.CONFIG_LAYOUT_DIRECTION; changed |= ActivityInfo.CONFIG_LAYOUT_DIRECTION;
} }
if (delta.touchscreen != TOUCHSCREEN_UNDEFINED if (delta.touchscreen != TOUCHSCREEN_UNDEFINED