diff options
| author | Alan Viverette <alanv@google.com> | 2015-10-20 21:56:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 21:56:40 +0000 |
| commit | ac02be311dce2ad8144429753419ca8659aa46b6 (patch) | |
| tree | 6cbb567e4484d368c8cba86d5c0e238819128934 /core/java | |
| parent | cb937cbc6ae8a026a90ce524fd74a01e7d48726b (diff) | |
| parent | 482349364715dfcd87dc83e0913fc60dc6df0497 (diff) | |
| download | frameworks_base-ac02be311dce2ad8144429753419ca8659aa46b6.zip frameworks_base-ac02be311dce2ad8144429753419ca8659aa46b6.tar.gz frameworks_base-ac02be311dce2ad8144429753419ca8659aa46b6.tar.bz2 | |
Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev
am: 4823493647
* commit '482349364715dfcd87dc83e0913fc60dc6df0497':
DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 4dfa7db..abcd614 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -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; |