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

Commit edfbb2fc authored by Jim Miller's avatar Jim Miller Committed by The Android Automerger
Browse files

Revert "Fix for layout parameter validation bug in GridLayout." 

This reverts commit 8a36e054 which was causing
keyguard_screen_tab_unlock.xml to have a bad layout.

Change-Id: I50bdc6dbdf8d7b98ef77eae532860d375574213e
parent 0f668fe2

core/java/android/widget/GridLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ public class GridLayout extends ViewGroup { 
    private void validateLayoutParams() {

        final boolean horizontal = (orientation == HORIZONTAL);

        final Axis axis = horizontal ? horizontalAxis : verticalAxis;

        final int count = max(0, axis.getCount()); // Handle negative values, including UNDEFINED

        final int count = (axis.definedCount != UNDEFINED) ? axis.definedCount : 0;



        int major = 0;

        int minor = 0;