Merge "Add FrameLayout.getMeasureAllChildren()" (703bde8c) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);

+25 −6

Original line number	Diff line number	Diff line
		@@ -465,8 +465,9 @@ 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.
		*
		@@ -478,10 +479,28 @@ public class FrameLayout extends ViewGroup {
		}

		/**
		* 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;
		}