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

Commit 165d0d57 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am eb4ed48f: am 3ab8e884: Merge "Fix bug #10514694 Specifying... 

am eb4ed48f: am 3ab8e884: Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev

* commit 'eb4ed48f':
  Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
parents 132fb928 eb4ed48f

core/java/android/widget/RelativeLayout.java

+16 −3
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ public class RelativeLayout extends ViewGroup { 


        views = mSortedVerticalChildren;

        count = views.length;

        final int targetSdkVersion = getContext().getApplicationInfo().targetSdkVersion;



        for (int i = 0; i < count; i++) {

            View child = views[i];
@@ -476,14 +477,26 @@ public class RelativeLayout extends ViewGroup { 


                if (isWrapContentWidth) {

                    if (isLayoutRtl()) {

                        if (targetSdkVersion < Build.VERSION_CODES.KEY_LIME_PIE) {

                            width = Math.max(width, myWidth - params.mLeft);

                        } else {

                            width = Math.max(width, myWidth - params.mLeft - params.leftMargin);

                        }

                    } else {

                        if (targetSdkVersion < Build.VERSION_CODES.KEY_LIME_PIE) {

                            width = Math.max(width, params.mRight);

                        } else {

                            width = Math.max(width, params.mRight + params.rightMargin);

                        }

                    }

                }



                if (isWrapContentHeight) {

                    if (targetSdkVersion < Build.VERSION_CODES.KEY_LIME_PIE) {

                        height = Math.max(height, params.mBottom);

                    } else {

                        height = Math.max(height, params.mBottom + params.bottomMargin);

                    }

                }



                if (child != ignore || verticalGravity) {