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

Commit cb3d0236 authored by Chet Haase's avatar Chet Haase
Browse files

Fix and clarify behavior of vertical/horizontal attributes 

There were a couple of problems with the new paddingHorizontal
and layout_mareginHorizontal attributes. For one thing, the behavior
of layout_marginHorizontal needed to change with respect to marginStart/End.
Instead of the implemented behavior where Horizontal took precedence over
start/end, the behavior is being changed such that start/end can override
horizontal. This makes it consistent with the way that the attributes work
for padding.

Also, the attribute docs were not correct. For one thing, they needed to be
updated to match the new behavior for marginHorizontal. Also, the docs for
the padding attributes (including the docs for the existing "padding") were
not correct for the behavior as-implemented (specifically with respect to the
precedence of the attributes where paddingStart/End are concerned).

Bug: 37756178  double-check logic of horizontal/vertical attributes wrt start/end attributes
Test: Updated cts tests, submitting at the same time
Change-Id: I85a102549022cbec7d7b5c76f31ac985db103372
parent 06fe8229

core/java/android/view/ViewGroup.java

+8 −6
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.view.animation.Animation; 
import android.view.animation.AnimationUtils;

import android.view.animation.LayoutAnimationController;

import android.view.animation.Transformation;



import com.android.internal.R;



import java.util.ArrayList;
@@ -7715,13 +7716,14 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
                        mMarginFlags |= RIGHT_MARGIN_UNDEFINED_MASK;

                        rightMargin = DEFAULT_MARGIN_RESOLVED;

                    }

                }



                startMargin = a.getDimensionPixelSize(

                        R.styleable.ViewGroup_MarginLayout_layout_marginStart,

                        DEFAULT_MARGIN_RELATIVE);

                endMargin = a.getDimensionPixelSize(

                        R.styleable.ViewGroup_MarginLayout_layout_marginEnd,

                        DEFAULT_MARGIN_RELATIVE);

                }



                if (verticalMargin >= 0) {

                    topMargin = verticalMargin;

core/res/res/values/attrs.xml

+9 −9
Original line number Diff line number Diff line
@@ -2290,8 +2290,9 @@ 


        <!-- Sets the padding, in pixels, of all four edges. Padding is defined as

             space between the edges of the view and the view's content. This value will take

             precedence over any of the edge-specific values, including

             paddingHorizontal and paddingVertical, if set. A view's size

             precedence over any of the edge-specific values (paddingLeft, paddingTop,

             paddingRight, paddingBottom, paddingHorizontal and paddingVertical), but will

             not override paddingStart or paddingEnd, if set. A view's size

             will include its padding. If a {@link android.R.attr#background}

             is provided, the padding will initially be set to that (0 if the

             drawable does not have padding). Explicitly setting a padding value
@@ -2299,7 +2300,7 @@ 
        <attr name="padding" format="dimension" />

        <!-- Sets the padding, in pixels, of the left and right edges; see

             {@link android.R.attr#padding}. This value will take precedence over

             paddingLeft, paddingRight, paddingStart, and paddingEnd, if set. -->

             paddingLeft and paddingRight, but not paddingStart or paddingEnd (if set). -->

        <attr name="paddingHorizontal" format="dimension" />

        <!-- Sets the padding, in pixels, of the top and bottom edges; see

             {@link android.R.attr#padding}. This value will take precedence over
@@ -3203,11 +3204,10 @@ 
        <attr name="layout_marginEnd" format="dimension"  />

        <!--  Specifies extra space on the left and right sides of this view.

              Specifying layout_marginHorizontal is equivalent to specifying

              either layout_marginLeft and layout_marginRight or

              layout_marginStart and layout_marginEnd with that same value.

              If both layout_marginHorizontal and any of layout_marginLeft,

              layout_marginRight, layout_marginStart, and layout_marginEnd are

              also specified, the layout_marginHorizontal value will take precedence over the

              layout_marginLeft and layout_marginRight.

              If both layout_marginHorizontal and either/both of layout_marginLeft

              and layout_marginRight are also specified, the layout_marginHorizontal

              value will take precedence over the

              edge-specific values. Also, layout_margin will always take precedence over

              any of these values, including layout_marginHorizontal.

              This space is outside this view's bounds.
@@ -3216,7 +3216,7 @@ 
        <!--  Specifies extra space on the top and bottom sides of this view.

              Specifying layout_marginVertical is equivalent to specifying

              layout_marginTop and layout_marginBottom with that same value.

              If both layout_marginVertical and either/both layout_marginTop and

              If both layout_marginVertical and either/both of layout_marginTop and

              layout_marginBottom are also specified, the layout_marginVertical value

              will take precedence over the edge-specific values.

              Also, layout_margin will always take precedence over