diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-03-30 15:56:48 -0700 |
|---|---|---|
| committer | Fabrice Di Meglio <fdimeglio@google.com> | 2012-03-30 15:56:48 -0700 |
| commit | 4a5268857eaa28be82ac6766bdfb8affad5c0bab (patch) | |
| tree | 7652f685c2939c2d9e6eaa78f6877bff7143e548 /core/java | |
| parent | 58a40a3e92f8a53ac1068f0839dec4a1707fa6fb (diff) | |
| download | frameworks_base-4a5268857eaa28be82ac6766bdfb8affad5c0bab.zip frameworks_base-4a5268857eaa28be82ac6766bdfb8affad5c0bab.tar.gz frameworks_base-4a5268857eaa28be82ac6766bdfb8affad5c0bab.tar.bz2 | |
Fix layout params resolution
- dont need to check if any parent as getResolvedLayoutDirection() is handling this case
Change-Id: I915b4a72e38d072005e47d3c5a3f63febbef6e60
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/View.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 6c964b0..8d572f4 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -13481,13 +13481,12 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal mPrivateFlags |= FORCE_LAYOUT; mPrivateFlags |= INVALIDATED; - if (mParent != null) { - if (mLayoutParams != null) { - mLayoutParams.onResolveLayoutDirection(getResolvedLayoutDirection()); - } - if (!mParent.isLayoutRequested()) { - mParent.requestLayout(); - } + if (mLayoutParams != null) { + mLayoutParams.onResolveLayoutDirection(getResolvedLayoutDirection()); + } + + if (mParent != null && !mParent.isLayoutRequested()) { + mParent.requestLayout(); } } |