Merge "Revert "Work around inconsistent views in RelativeLayout.onMeasure()"" into mnc-dev (7c669f45) · Commits · e / os / android_frameworks_base

core/java/android/widget/RelativeLayout.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -522,7 +522,7 @@ public class RelativeLayout extends ViewGroup {
		View baselineView = null;
		LayoutParams baselineParams = null;
		for (int i = 0; i < count; i++) {
		final View child = views[i];
		final View child = getChildAt(i);
		if (child.getVisibility() != GONE) {
		final LayoutParams childParams = (LayoutParams) child.getLayoutParams();
		if (baselineView == null \|\| baselineParams == null
		@@ -548,9 +548,9 @@ public class RelativeLayout extends ViewGroup {

		if (offsetHorizontalAxis) {
		for (int i = 0; i < count; i++) {
		final View child = views[i];
		View child = getChildAt(i);
		if (child.getVisibility() != GONE) {
		final LayoutParams params = (LayoutParams) child.getLayoutParams();
		LayoutParams params = (LayoutParams) child.getLayoutParams();
		final int[] rules = params.getRules(layoutDirection);
		if (rules[CENTER_IN_PARENT] != 0 \|\| rules[CENTER_HORIZONTAL] != 0) {
		centerHorizontal(child, params, width);
		@@ -578,9 +578,9 @@ public class RelativeLayout extends ViewGroup {

		if (offsetVerticalAxis) {
		for (int i = 0; i < count; i++) {
		final View child = views[i];
		View child = getChildAt(i);
		if (child.getVisibility() != GONE) {
		final LayoutParams params = (LayoutParams) child.getLayoutParams();
		LayoutParams params = (LayoutParams) child.getLayoutParams();
		final int[] rules = params.getRules(layoutDirection);
		if (rules[CENTER_IN_PARENT] != 0 \|\| rules[CENTER_VERTICAL] != 0) {
		centerVertical(child, params, height);
		@@ -607,9 +607,9 @@ public class RelativeLayout extends ViewGroup {
		final int verticalOffset = contentBounds.top - top;
		if (horizontalOffset != 0 \|\| verticalOffset != 0) {
		for (int i = 0; i < count; i++) {
		final View child = views[i];
		View child = getChildAt(i);
		if (child.getVisibility() != GONE && child != ignore) {
		final LayoutParams params = (LayoutParams) child.getLayoutParams();
		LayoutParams params = (LayoutParams) child.getLayoutParams();
		if (horizontalGravity) {
		params.mLeft += horizontalOffset;
		params.mRight += horizontalOffset;
		@@ -626,9 +626,9 @@ public class RelativeLayout extends ViewGroup {
		if (isLayoutRtl()) {
		final int offsetWidth = myWidth - width;
		for (int i = 0; i < count; i++) {
		final View child = views[i];
		View child = getChildAt(i);
		if (child.getVisibility() != GONE) {
		final LayoutParams params = (LayoutParams) child.getLayoutParams();
		LayoutParams params = (LayoutParams) child.getLayoutParams();
		params.mLeft -= offsetWidth;
		params.mRight -= offsetWidth;
		}