am 113173d5: am 386dbb89: am fdf102e6: Merge "Constrain child width and height... (c4fe77e3) · Commits · e / os / android_frameworks_base

core/java/android/widget/FrameLayout.java

+14 −13

Original line number	Diff line number	Diff line
		@@ -230,16 +230,15 @@ public class FrameLayout extends ViewGroup {
		if (count > 1) {
		for (int i = 0; i < count; i++) {
		final View child = mMatchParentChildren.get(i);

		final MarginLayoutParams lp = (MarginLayoutParams) child.getLayoutParams();
		int childWidthMeasureSpec;
		int childHeightMeasureSpec;

		final int childWidthMeasureSpec;
		if (lp.width == LayoutParams.MATCH_PARENT) {
		childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(getMeasuredWidth() -
		getPaddingLeftWithForeground() - getPaddingRightWithForeground() -
		lp.leftMargin - lp.rightMargin,
		MeasureSpec.EXACTLY);
		final int width = Math.max(0, getMeasuredWidth()
		- getPaddingLeftWithForeground() - getPaddingRightWithForeground()
		- lp.leftMargin - lp.rightMargin);
		childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(
		width, MeasureSpec.EXACTLY);
		} else {
		childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec,
		getPaddingLeftWithForeground() + getPaddingRightWithForeground() +
		@@ -247,11 +246,13 @@ public class FrameLayout extends ViewGroup {
		lp.width);
		}

		final int childHeightMeasureSpec;
		if (lp.height == LayoutParams.MATCH_PARENT) {
		childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(getMeasuredHeight() -
		getPaddingTopWithForeground() - getPaddingBottomWithForeground() -
		lp.topMargin - lp.bottomMargin,
		MeasureSpec.EXACTLY);
		final int height = Math.max(0, getMeasuredHeight()
		- getPaddingTopWithForeground() - getPaddingBottomWithForeground()
		- lp.topMargin - lp.bottomMargin);
		childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(
		height, MeasureSpec.EXACTLY);
		} else {
		childHeightMeasureSpec = getChildMeasureSpec(heightMeasureSpec,
		getPaddingTopWithForeground() + getPaddingBottomWithForeground() +