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

Commit 235554e8 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am da6f2b54: am 9c982340: Merge "Fix LinearLayout measureWithLargestChild for... 

am da6f2b54: am 9c982340: Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev

* commit 'da6f2b54':
  Fix LinearLayout measureWithLargestChild for wrap_content views
parents 73c5ada0 da6f2b54

core/java/android/widget/LinearLayout.java

+2 −2
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ public class LinearLayout extends ViewGroup { 


            // We have no limit, so make all weighted views as tall as the largest child.

            // Children will have already been measured once.

            if (useLargestChild && widthMode == MeasureSpec.UNSPECIFIED) {

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

                for (int i = 0; i < count; i++) {

                    final View child = getVirtualChildAt(i);
@@ -1283,7 +1283,7 @@ public class LinearLayout extends ViewGroup { 


            // We have no limit, so make all weighted views as wide as the largest child.

            // Children will have already been measured once.

            if (useLargestChild && widthMode == MeasureSpec.UNSPECIFIED) {

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

                for (int i = 0; i < count; i++) {

                    final View child = getVirtualChildAt(i);