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

Commit 3dc38c1b authored by Philip Milne's avatar Philip Milne Committed by Android (Google) Code Review
Browse files

Merge "More on weights in GridLayout"

parents b5eb09f6 dea890fa

core/java/android/widget/GridLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ public class GridLayout extends ViewGroup { 
                // we must include views that are GONE here, see introductory javadoc

                LayoutParams lp = getLayoutParams(c);

                Spec spec = horizontal ? lp.columnSpec : lp.rowSpec;

                int size = !hasWeights() ?

                int size = (spec.weight == 0) ?

                        getMeasurementIncludingMargin(c, horizontal) :

                        getOriginalMeasurements()[i] + getDeltas()[i];

                groupBounds.getValue(i).include(GridLayout.this, c, spec, this, size);