diff options
| author | Chet Haase <chet@google.com> | 2015-12-07 21:29:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-07 21:29:00 +0000 |
| commit | f1b40f65b0a672f17bfebd3c8e93e5f5fb60bdfd (patch) | |
| tree | ed6a9b0199b1a54a53c3727fa34fb8ff5fc342e5 /core/java/android/widget/LinearLayout.java | |
| parent | 7f864cc79d019bab27af991529512ac7b474069e (diff) | |
| parent | 016f4457574c33b4c9c8a74189c77e1fbe411a3e (diff) | |
Merge "Fix requestLayout() optimizations"
Diffstat (limited to 'core/java/android/widget/LinearLayout.java')
| -rw-r--r-- | core/java/android/widget/LinearLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index ba868a15ef1e..bdb1e83438c5 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -683,7 +683,7 @@ public class LinearLayout extends ViewGroup { } } - if (matchAxisFilter != 0) { + if (matchAxisFilter != 0 || wrapAxisFilter != 0) { final ViewParent parent = getParent(); if (parent != null) { // If our parent depends on us for an axis, then our layout can also be affected |