diff options
| author | Alan Viverette <alanv@google.com> | 2015-10-20 21:44:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-20 21:44:35 +0000 |
| commit | 482349364715dfcd87dc83e0913fc60dc6df0497 (patch) | |
| tree | 3e0a4a8d13ba779cf95142b36b9c48044cca9ceb /core | |
| parent | 7d7a2254bc41d2dfc34fbb8693cb0dad2ccd528a (diff) | |
| parent | b5817779a9d918b9e0bee518d88a781fe7d811f4 (diff) | |
| download | frameworks_base-482349364715dfcd87dc83e0913fc60dc6df0497.zip frameworks_base-482349364715dfcd87dc83e0913fc60dc6df0497.tar.gz frameworks_base-482349364715dfcd87dc83e0913fc60dc6df0497.tar.bz2 | |
Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev
Diffstat (limited to 'core')
| -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; |