Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev

This commit is contained in:
Alan Viverette
2015-10-20 21:44:35 +00:00
committed by Android (Google) Code Review

View File

@@ -704,7 +704,7 @@ public class RelativeLayout extends ViewGroup {
} }
final int heightMode; final int heightMode;
if (params.width == LayoutParams.MATCH_PARENT) { if (params.height == LayoutParams.MATCH_PARENT) {
heightMode = MeasureSpec.EXACTLY; heightMode = MeasureSpec.EXACTLY;
} else { } else {
heightMode = MeasureSpec.AT_MOST; heightMode = MeasureSpec.AT_MOST;