Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0455174d: Merge "Update clipToPadding docs" into lmp-mr1-dev

Browse Source 
* commit '0455174d347bf451e830584bc3f6f35c3c560282':
  Update clipToPadding docs
This commit is contained in:
Chris Craik
2014-11-19 00:09:32 +00:00
committed by Android Git Automerger
parent de71dd5cb4 0455174d34
commit df57b22bc6
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/view/ViewGroup.java
View File

@@ -3534,8 +3534,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
}
/**
* By default, children are clipped to the padding of the ViewGroup. This
* allows view groups to override this behavior
* Sets whether this ViewGroup will clip its children to its padding, 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.
*
* @param clipToPadding true to clip children to the padding of the
* group, false otherwise
@@ -3549,7 +3552,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
}
/**
* Check if this ViewGroup is configured to clip child views to its padding.
* Returns whether this ViewGroup will clip its children to its padding, 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
*

4
core/res/res/values/attrs.xml
View File

@@ -2639,8 +2639,8 @@
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 drawing surface so as to exclude
the padding area. This property is set to true by default. -->
<!-- Defines whether the ViewGroup will clip its children 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. -->