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

Commit 070b22bd authored by Alan Viverette's avatar Alan Viverette
Browse files

Exclude children from excess space distribution when using largest child 

Preserves API 23 behavior.

Bug: 29872769
Change-Id: I514cde81dcca4d78238f407251805cced4c0bea1
parent 43f6a45e

core/java/android/widget/LinearLayout.java

+6 −2
Original line number Diff line number Diff line
@@ -890,7 +890,9 @@ public class LinearLayout extends ViewGroup { 
                    remainingWeightSum -= childWeight;



                    final int childHeight;

                    if (lp.height == 0 && (!mAllowInconsistentMeasurement

                    if (mUseLargestChild && heightMode != MeasureSpec.EXACTLY) {

                        childHeight = largestChildHeight;

                    } else if (lp.height == 0 && (!mAllowInconsistentMeasurement

                            || heightMode == MeasureSpec.EXACTLY)) {

                        // This child needs to be laid out from scratch using

                        // only its share of excess space.
@@ -1272,7 +1274,9 @@ public class LinearLayout extends ViewGroup { 
                    remainingWeightSum -= childWeight;



                    final int childWidth;

                    if (lp.width == 0 && (!mAllowInconsistentMeasurement

                    if (mUseLargestChild && widthMode != MeasureSpec.EXACTLY) {

                        childWidth = largestChildWidth;

                    } else if (lp.width == 0 && (!mAllowInconsistentMeasurement

                            || widthMode == MeasureSpec.EXACTLY)) {

                        // This child needs to be laid out from scratch using

                        // only its share of excess space.