diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index a7e739d9c2485..59f6d9dc12dc5 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -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. *
* 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. *
* 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
*/
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 46e1e5eefa758..039c5e0f8518e 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -2771,8 +2771,9 @@
to allow the children to draw outside of their bounds. The default value of
this property is true. -->