commit f1b40f65b0a672f17bfebd3c8e93e5f5fb60bdfd
author Chet Haase <chet@google.com> Mon Dec 07 21:29:00 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 07 21:29:00 2015 +0000
tree ed6a9b0199b1a54a53c3727fa34fb8ff5fc342e5
parent 7f864cc79d019bab27af991529512ac7b474069e
parent 016f4457574c33b4c9c8a74189c77e1fbe411a3e

Merge "Fix requestLayout() optimizations"

core/java/android/view/ViewGroup.java

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 11df9a3..488063b 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -5631,7 +5631,7 @@
         final int matchAxisFilter = ((lp.width == MATCH_PARENT ? FLAG_LAYOUT_AXIS_HORIZONTAL : 0)
                 | (lp.height == MATCH_PARENT ? FLAG_LAYOUT_AXIS_VERTICAL : 0)) & axisFilter;
 
-        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

core/java/android/widget/LinearLayout.java

diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java
index ba868a1..bdb1e83 100644
--- a/core/java/android/widget/LinearLayout.java
+++ b/core/java/android/widget/LinearLayout.java
@@ -683,7 +683,7 @@
             }
         }
 
-        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