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

Commit 59420ecd authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #7164967... 

Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev
parents 9bef3294 d3156a2a

core/java/android/view/ViewGroup.java

+0 −5
Original line number Diff line number Diff line
@@ -5990,11 +5990,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
         */

        @Override

        public void resolveLayoutDirection(int layoutDirection) {

            // No need to resolve if it is the same layout direction as before

            if (this.layoutDirection == layoutDirection) {

                return;

            }



            setLayoutDirection(layoutDirection);



            if (!isMarginRelative()) return;