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

Commit 91aefd57 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev am: 3a3fb73c 

am: ff71f781

* commit 'ff71f781':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I9bc9d812b9e08f73d53f8243bf0ae78d7853d72b
parents e1cac3a5 ff71f781

core/java/android/widget/LinearLayout.java

+6 −24
Original line number Diff line number Diff line
@@ -708,7 +708,6 @@ public class LinearLayout extends ViewGroup { 
        final int baselineChildIndex = mBaselineAlignedChildIndex;        

        final boolean useLargestChild = mUseLargestChild;



        int lastWeightedChildIndex = -1;

        int largestChildHeight = Integer.MIN_VALUE;

        int consumedExcessSpace = 0;
@@ -730,10 +729,8 @@ public class LinearLayout extends ViewGroup { 
            }



            final LayoutParams lp = (LayoutParams) child.getLayoutParams();

            if (lp.weight > 0) {



            totalWeight += lp.weight;

                lastWeightedChildIndex = i;

            }



            final boolean useExcessSpace = lp.height == 0 && lp.weight > 0;

            if (heightMode == MeasureSpec.EXACTLY && useExcessSpace) {
@@ -888,13 +885,7 @@ public class LinearLayout extends ViewGroup { 
                final LayoutParams lp = (LayoutParams) child.getLayoutParams();

                final float childWeight = lp.weight;

                if (childWeight > 0) {

                    final int share;

                    if (i == lastWeightedChildIndex) {

                        share = remainingExcess;

                    } else {

                        share = (int) (childWeight * remainingExcess / remainingWeightSum);

                    }



                    final int share = (int) (childWeight * remainingExcess / remainingWeightSum);

                    remainingExcess -= share;

                    remainingWeightSum -= childWeight;
@@ -1055,7 +1046,6 @@ public class LinearLayout extends ViewGroup { 
        

        final boolean isExactly = widthMode == MeasureSpec.EXACTLY;



        int lastWeightedChildIndex = -1;

        int largestChildWidth = Integer.MIN_VALUE;

        int usedExcessSpace = 0;
@@ -1077,10 +1067,8 @@ public class LinearLayout extends ViewGroup { 
            }



            final LayoutParams lp = (LayoutParams) child.getLayoutParams();

            if (lp.weight > 0) {



            totalWeight += lp.weight;

                lastWeightedChildIndex = i;

            }



            final boolean useExcessSpace = lp.width == 0 && lp.weight > 0;

            if (widthMode == MeasureSpec.EXACTLY && useExcessSpace) {
@@ -1279,13 +1267,7 @@ public class LinearLayout extends ViewGroup { 
                final LayoutParams lp = (LayoutParams) child.getLayoutParams();

                final float childWeight = lp.weight;

                if (childWeight > 0) {

                    final int share;

                    if (i == lastWeightedChildIndex) {

                        share = remainingExcess;

                    } else {

                        share = (int) (childWeight * remainingExcess / remainingWeightSum);

                    }



                    final int share = (int) (childWeight * remainingExcess / remainingWeightSum);

                    remainingExcess -= share;

                    remainingWeightSum -= childWeight;