Commit e21329ad authored Oct 20, 2015 by Alan Viverette Committed by android-build-merger Oct 20, 2015

Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout...

Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev am: 48234936 am: ac02be31
am: 41707942

* commit '41707942':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure

parents c3152909 41707942

core/java/android/widget/RelativeLayout.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -704,7 +704,7 @@ public class RelativeLayout extends ViewGroup {
		}

		final int heightMode;
		if (params.width == LayoutParams.MATCH_PARENT) {
		if (params.height == LayoutParams.MATCH_PARENT) {
		heightMode = MeasureSpec.EXACTLY;
		} else {
		heightMode = MeasureSpec.AT_MOST;