diff options
| author | Doris Liu <tianliu@google.com> | 2015-05-29 20:28:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-29 20:28:21 +0000 |
| commit | f042cd841fcc6607bb84f8ddb25db3f4b6ddb3e0 (patch) | |
| tree | 87a42cafd621775910bf3ffa7e3f66762cf53d88 /core/java | |
| parent | 815be147a35452d52feb0610ff11d8645351ad9f (diff) | |
| parent | b134b5e376652720d746703ac2f58ac85b2840ee (diff) | |
Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index a7e739d9c248..59f6d9dc12dc 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. * <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 */ |