Merge "Add FrameLayout.getMeasureAllChildren()"

This commit is contained in:
Steve Block
2011-09-08 10:38:15 -07:00
committed by Android (Google) Code Review
2 changed files with 27 additions and 7 deletions

View File

@@ -25917,8 +25917,9 @@ package android.widget {
ctor public FrameLayout(android.content.Context);
ctor public FrameLayout(android.content.Context, android.util.AttributeSet);
ctor public FrameLayout(android.content.Context, android.util.AttributeSet, int);
method public boolean getConsiderGoneChildrenWhenMeasuring();
method public deprecated boolean getConsiderGoneChildrenWhenMeasuring();
method public android.graphics.drawable.Drawable getForeground();
method public boolean getMeasureAllChildren();
method protected void onLayout(boolean, int, int, int, int);
method public void setForeground(android.graphics.drawable.Drawable);
method public void setForegroundGravity(int);

View File

@@ -465,23 +465,42 @@ public class FrameLayout extends ViewGroup {
}
/**
* Determines whether to measure all children or just those in
* the VISIBLE or INVISIBLE state when measuring. Defaults to false.
* Sets whether to consider all children, or just those in
* the VISIBLE or INVISIBLE state, when measuring. Defaults to false.
*
* @param measureAll true to consider children marked GONE, false otherwise.
* Default value is false.
*
*
* @attr ref android.R.styleable#FrameLayout_measureAllChildren
*/
@android.view.RemotableViewMethod
public void setMeasureAllChildren(boolean measureAll) {
mMeasureAllChildren = measureAll;
}
/**
* Determines whether to measure all children or just those in
* the VISIBLE or INVISIBLE state when measuring.
* Determines whether all children, or just those in the VISIBLE or
* INVISIBLE state, are considered when measuring.
*
* @return Whether all children are considered when measuring.
*
* @deprecated This method is deprecated in favor of
* {@link #getMeasureAllChildren() getMeasureAllChildren()}, which was
* renamed for consistency with
* {@link #setMeasureAllChildren(boolean) setMeasureAllChildren()}.
*/
@Deprecated
public boolean getConsiderGoneChildrenWhenMeasuring() {
return getMeasureAllChildren();
}
/**
* Determines whether all children, or just those in the VISIBLE or
* INVISIBLE state, are considered when measuring.
*
* @return Whether all children are considered when measuring.
*/
public boolean getMeasureAllChildren() {
return mMeasureAllChildren;
}