Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1b40f65 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Fix requestLayout() optimizations"

parents 7f864cc7 016f4457

core/java/android/view/ViewGroup.java

+1 −1
Original line number Diff line number Diff line
@@ -5631,7 +5631,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        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

+1 −1
Original line number Diff line number Diff line
@@ -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