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

Commit 83261239 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 5056699: GridLayout should maintain static indices for "gone" views."

parents f0e85d3a 6235b47c

core/java/android/widget/GridLayout.java

+0 −2
Original line number Diff line number Diff line
@@ -596,7 +596,6 @@ public class GridLayout extends ViewGroup { 
                int col = 0;

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

                    View c = getChildAt(i);

                    if (isGone(c)) continue;

                    LayoutParams lp = getLayoutParams1(c);



                    final Spec colSpec = lp.columnSpec;
@@ -1002,7 +1001,6 @@ public class GridLayout extends ViewGroup { 
            int count = -1;

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

                View c = getChildAt(i);

                if (isGone(c)) continue;

                LayoutParams params = getLayoutParams(c);

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

                count = max(count, spec.span.min);