Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41707942 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

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

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

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;