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

Commit 6acf744f authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am f4a1dad6: am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename... 

am f4a1dad6: am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev

* commit 'f4a1dad6':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
parents 38fbe45d f4a1dad6

api/17.txt

+1 −1
Original line number Diff line number Diff line
@@ -25677,7 +25677,7 @@ package android.view { 
    ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet);

    ctor public ViewGroup.LayoutParams(int, int);

    ctor public ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams);

    method public void onResolveLayoutDirection(int);

    method public void resolveLayoutDirection(int);

    method protected void setBaseAttributes(android.content.res.TypedArray, int, int);

    field public static final deprecated int FILL_PARENT = -1; // 0xffffffff

    field public static final int MATCH_PARENT = -1; // 0xffffffff

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -25703,7 +25703,7 @@ package android.view { 
    ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet);

    ctor public ViewGroup.LayoutParams(int, int);

    ctor public ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams);

    method public void onResolveLayoutDirection(int);

    method public void resolveLayoutDirection(int);

    method protected void setBaseAttributes(android.content.res.TypedArray, int, int);

    field public static final deprecated int FILL_PARENT = -1; // 0xffffffff

    field public static final int MATCH_PARENT = -1; // 0xffffffff

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -10000,7 +10000,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     */

    private void resolveLayoutParams() {

        if (mLayoutParams != null) {

            mLayoutParams.onResolveLayoutDirection(getLayoutDirection());

            mLayoutParams.resolveLayoutDirection(getLayoutDirection());

        }

    }

































core/java/android/view/ViewGroup.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -5633,7 +5633,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager













         * {@link View#LAYOUT_DIRECTION_LTR}















         * {@link View#LAYOUT_DIRECTION_RTL}















         */













        public void onResolveLayoutDirection(int layoutDirection) {













        public void resolveLayoutDirection(int layoutDirection) {















        }































        /**










@@ -5977,7 +5977,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager













         * may be overridden depending on layout direction.















         */















        @Override













        public void onResolveLayoutDirection(int layoutDirection) {













        public void resolveLayoutDirection(int layoutDirection) {















            setLayoutDirection(layoutDirection);































            if (!isMarginRelative()) return;

































core/java/android/widget/RelativeLayout.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -741,7 +741,7 @@ public class RelativeLayout extends ViewGroup {





























        final int layoutDirection = getLayoutDirection();















        int[] rules = params.getRules(layoutDirection);













        params.onResolveLayoutDirection(layoutDirection);













        params.resolveLayoutDirection(layoutDirection);































        if (params.mLeft < 0 && params.mRight >= 0) {















            // Right is fixed, but left varies










@@ -995,7 +995,7 @@ public class RelativeLayout extends ViewGroup {













            if (child.getVisibility() != GONE) {















                RelativeLayout.LayoutParams st =















                        (RelativeLayout.LayoutParams) child.getLayoutParams();













                st.onResolveLayoutDirection(getLayoutDirection());













                st.resolveLayoutDirection(getLayoutDirection());















                child.layout(st.mLeft, st.mTop, st.mRight, st.mBottom);















            }















        }










@@ -1405,7 +1405,7 @@ public class RelativeLayout extends ViewGroup {













        }































        @Override













        public void onResolveLayoutDirection(int layoutDirection) {













        public void resolveLayoutDirection(int layoutDirection) {















            final boolean isLayoutRtl = isLayoutRtl();















            if (isLayoutRtl) {















                if (mStart != DEFAULT_RELATIVE) mRight = mStart;









@@ -1419,7 +1419,7 @@ public class RelativeLayout extends ViewGroup {













                resolveRules(layoutDirection);















            }















            // This will set the layout direction













            super.onResolveLayoutDirection(layoutDirection);













            super.resolveLayoutDirection(layoutDirection);















        }















    }