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

Commit 626e3fa1 authored by Doris Liu's avatar Doris Liu Committed by Android Git Automerger
Browse files

am 0040c7d2: am c2713141: am f042cd84: Merge "Update doc to include how... 

am 0040c7d2: am c2713141: am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev

* commit '0040c7d2':
  Update doc to include how clipToPadding affects EdgeEffect
parents b1228020 0040c7d2

core/java/android/view/ViewGroup.java

+9 −8
Original line number Diff line number Diff line
@@ -3602,14 +3602,14 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
    }



    /**

     * Sets whether this ViewGroup will clip its children to its padding, if

     * padding is present.

     * Sets whether this ViewGroup will clip its children to its padding and resize (but not

     * clip) any EdgeEffect to the padded region, if padding is present.

     * <p>

     * By default, children are clipped to the padding of their parent

     * Viewgroup. This clipping behavior is only enabled if padding is non-zero.

     * ViewGroup. This clipping behavior is only enabled if padding is non-zero.

     *

     * @param clipToPadding true to clip children to the padding of the

     *        group, false otherwise

     * @param clipToPadding true to clip children to the padding of the group, and resize (but

     *        not clip) any EdgeEffect to the padded region. False otherwise.

     * @attr ref android.R.styleable#ViewGroup_clipToPadding

     */

    public void setClipToPadding(boolean clipToPadding) {
@@ -3620,13 +3620,14 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
    }



    /**

     * Returns whether this ViewGroup will clip its children to its padding, if

     * padding is present.

     * Returns whether this ViewGroup will clip its children to its padding, and resize (but

     * not clip) any EdgeEffect to the padded region, if padding is present.

     * <p>

     * By default, children are clipped to the padding of their parent

     * Viewgroup. This clipping behavior is only enabled if padding is non-zero.

     *

     * @return true if this ViewGroup clips children to its padding, false otherwise

     * @return true if this ViewGroup clips children to its padding and resizes (but doesn't

     *         clip) any EdgeEffect to the padded region, false otherwise.

     *

     * @attr ref android.R.styleable#ViewGroup_clipToPadding

     */

core/res/res/values/attrs.xml

+3 −2
Original line number Diff line number Diff line
@@ -2771,8 +2771,9 @@ 
             to allow the children to draw outside of their bounds. The default value of

             this property is true. -->

        <attr name="clipChildren" format="boolean" />

        <!-- Defines whether the ViewGroup will clip its children to its padding, if

             padding is not zero. This property is set to true by default. -->

        <!-- Defines whether the ViewGroup will clip its children and resize (but not clip) any

             EdgeEffect to its padding, if padding is not zero. This property is set to true by

             default. -->

        <attr name="clipToPadding" format="boolean" />

        <!-- Defines the layout animation to use the first time the ViewGroup is laid out.

             Layout animations can also be started manually after the first layout. -->