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

Commit 8cdbd6e1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add docs for new padding/margin attributes." into oc-dev

parents 564d0bf1 353d397d

core/java/android/view/View.java

+2 −0
Original line number Diff line number Diff line
@@ -724,6 +724,8 @@ import java.util.function.Predicate; 
 * @attr ref android.R.styleable#View_nextFocusUp

 * @attr ref android.R.styleable#View_onClick

 * @attr ref android.R.styleable#View_padding

 * @attr ref android.R.styleable#View_paddingHorizontal

 * @attr ref android.R.styleable#View_paddingVertical

 * @attr ref android.R.styleable#View_paddingBottom

 * @attr ref android.R.styleable#View_paddingLeft

 * @attr ref android.R.styleable#View_paddingRight

core/java/android/view/ViewGroup.java

+10 −0
Original line number Diff line number Diff line
@@ -7608,6 +7608,16 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
     * See

     * {@link android.R.styleable#ViewGroup_MarginLayout ViewGroup Margin Layout Attributes}

     * for a list of all child view attributes that this class supports.

     *

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_margin

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginHorizontal

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginVertical

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginLeft

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginTop

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginRight

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginBottom

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginStart

     * @attr ref android.R.styleable#ViewGroup_MarginLayout_layout_marginEnd

     */

    public static class MarginLayoutParams extends ViewGroup.LayoutParams {

        /**