Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 4823493647

* commit '482349364715dfcd87dc83e0913fc60dc6df0497':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
This commit is contained in:
Alan Viverette
2015-10-20 21:56:40 +00:00
committed by android-build-merger
parent cb937cbc6a 4823493647
commit ac02be311d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/RelativeLayout.java
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;