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

Commit 1a7a63ad authored by Philip Milne's avatar Philip Milne Committed by Chet Haase
Browse files

Fix for b/16400888 - API Review: GridLayout attributes 

Column weights specify the relative proportions of space distribution 
within a *row*. With that in mind, I flipped the vertical and horizontal 
axes in the docs - but that was a mistake. This CL flips the docs back. 
The code works the right way around so doesn't need to be modified.

Change-Id: I1a36882eee8d1b9bd7b8ef10e03cbf66de0ac261
(cherry picked from commit 4ae5f5ee917b2014abe3b6e0b99451693cd2b896)
parent 38553adb

core/res/res/values/attrs.xml

+3 −3
Original line number Diff line number Diff line
@@ -4483,12 +4483,12 @@ 
        <!-- The row boundary delimiting the top of the group of cells

        occupied by this view. -->

        <attr name="layout_row" format="integer" />

        <!-- The row span: the difference between the bottom and top

        <!-- The row span: the difference between the top and bottom

        boundaries delimiting the group of cells occupied by this view.

        The default is one.

        See {@link android.widget.GridLayout.Spec}. -->

        <attr name="layout_rowSpan" format="integer" min="1" />

        <!-- The relative proportion of horizontal space that should be allocated to this view

        <!-- The relative proportion of vertical space that should be allocated to this view

        during excess space distribution. -->

        <attr name="layout_rowWeight" format="float" />

        <!-- The column boundary delimiting the left of the group of cells
@@ -4499,7 +4499,7 @@ 
        The default is one.

        See {@link android.widget.GridLayout.Spec}. -->

        <attr name="layout_columnSpan" format="integer" min="1" />

        <!-- The relative proportion of vertical space that should be allocated to this view

        <!-- The relative proportion of horizontal space that should be allocated to this view

        during excess space distribution. -->

        <attr name="layout_columnWeight" format="float" />

        <!-- Gravity specifies how a component should be placed in its group of cells.