diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-07-22 19:24:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-22 19:24:52 -0700 |
| commit | da89e57130363a9b35983368f0f8df3237a9dbfd (patch) | |
| tree | 4e1cf32ae16430e67218396c74a8ff9387399bb9 /core | |
| parent | aba28e7fecb06adab8de51619b2929b640369e83 (diff) | |
| parent | d794acaa6b1c8333bb9c12a84cd74fe24662bb90 (diff) | |
| download | frameworks_base-da89e57130363a9b35983368f0f8df3237a9dbfd.zip frameworks_base-da89e57130363a9b35983368f0f8df3237a9dbfd.tar.gz frameworks_base-da89e57130363a9b35983368f0f8df3237a9dbfd.tar.bz2 | |
Merge "Code cleaning"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/View.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index ecb391d..c68b01c 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -12028,12 +12028,13 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit mPrivateFlags |= FORCE_LAYOUT; mPrivateFlags |= INVALIDATED; - if (mLayoutParams != null && mParent != null) { - mLayoutParams.resolveWithDirection(getResolvedLayoutDirection()); - } - - if (mParent != null && !mParent.isLayoutRequested()) { - mParent.requestLayout(); + if (mParent != null) { + if (mLayoutParams != null) { + mLayoutParams.resolveWithDirection(getResolvedLayoutDirection()); + } + if (!mParent.isLayoutRequested()) { + mParent.requestLayout(); + } } } |