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

Commit 13d5753f authored by Philip Milne's avatar Philip Milne Committed by Android Git Automerger
Browse files

am fd0fa65e: Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for... 

am fd0fa65e: Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child\'s size/measurements even when a child is "GONE"""

# Via Android (Google) Code Review
* commit 'fd0fa65e':
  Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""
parents a11c3814 fd0fa65e

core/java/android/widget/GridLayout.java

+0 −2
Original line number Diff line number Diff line
@@ -1235,7 +1235,6 @@ public class GridLayout extends ViewGroup { 
            Assoc<Spec, Bounds> assoc = Assoc.of(Spec.class, Bounds.class);

            for (int i = 0, N = getChildCount(); i < N; i++) {

                View c = getChildAt(i);

                if (c.getVisibility() == View.GONE) continue;

                LayoutParams lp = getLayoutParams(c);

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

                Bounds bounds = getAlignment(spec.alignment, horizontal).getBounds();
@@ -1251,7 +1250,6 @@ public class GridLayout extends ViewGroup { 
            }

            for (int i = 0, N = getChildCount(); i < N; i++) {

                View c = getChildAt(i);

                if (c.getVisibility() == View.GONE) continue;

                LayoutParams lp = getLayoutParams(c);

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

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