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

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

am b4426f15: Merge "Fix bug #8858012 layer-list\'s bitmap item\'s start/end... 

am b4426f15: Merge "Fix bug #8858012 layer-list\'s bitmap item\'s start/end gravity is incorrect on RTL under certain conditions" into jb-mr2-dev

* commit 'b4426f15':
  Fix bug #8858012 layer-list's bitmap item's start/end gravity is incorrect on RTL under certain conditions
parents e4e4a069 b4426f15

graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java

+1 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ public class AnimatedRotateDrawable extends Drawable implements Drawable.Callbac 
                    mDrawable = source.mDrawable.getConstantState().newDrawable();

                }

                mDrawable.setCallback(owner);

                mDrawable.setLayoutDirection(source.mDrawable.getLayoutDirection());

                mPivotXRel = source.mPivotXRel;

                mPivotX = source.mPivotX;

                mPivotYRel = source.mPivotYRel;

graphics/java/android/graphics/drawable/ClipDrawable.java

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ public class ClipDrawable extends Drawable implements Drawable.Callback { 
                    mDrawable = orig.mDrawable.getConstantState().newDrawable();

                }

                mDrawable.setCallback(owner);

                mDrawable.setLayoutDirection(orig.mDrawable.getLayoutDirection());

                mOrientation = orig.mOrientation;

                mGravity = orig.mGravity;

                mCheckedConstantState = mCanConstantState = true;

graphics/java/android/graphics/drawable/DrawableContainer.java

+2 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { 
                d.setState(getState());

                d.setLevel(getLevel());

                d.setBounds(getBounds());

                d.setLayoutDirection(getLayoutDirection());

            }

        } else {

            mCurrDrawable = null;
@@ -480,6 +481,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { 
                        mDrawables[i] = origDr[i].getConstantState().newDrawable();

                    }

                    mDrawables[i].setCallback(owner);

                    mDrawables[i].setLayoutDirection(origDr[i].getLayoutDirection());

                }



                mCheckedConstantState = mCanConstantState = true;

graphics/java/android/graphics/drawable/InsetDrawable.java

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ public class InsetDrawable extends Drawable implements Drawable.Callback 
                    mDrawable = orig.mDrawable.getConstantState().newDrawable();

                }

                mDrawable.setCallback(owner);

                mDrawable.setLayoutDirection(orig.mDrawable.getLayoutDirection());

                mInsetLeft = orig.mInsetLeft;

                mInsetTop = orig.mInsetTop;

                mInsetRight = orig.mInsetRight;

graphics/java/android/graphics/drawable/LayerDrawable.java

+5 −6
Original line number Diff line number Diff line
@@ -589,13 +589,11 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { 
    /** @hide */

    @Override

    public void setLayoutDirection(int layoutDirection) {

        if (getLayoutDirection() != layoutDirection) {

        final ChildDrawable[] array = mLayerState.mChildren;

        final int N = mLayerState.mNum;

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

            array[i].mDrawable.setLayoutDirection(layoutDirection);

        }

        }

        super.setLayoutDirection(layoutDirection);

    }
@@ -641,6 +639,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { 
                        r.mDrawable = or.mDrawable.getConstantState().newDrawable();

                    }

                    r.mDrawable.setCallback(owner);

                    r.mDrawable.setLayoutDirection(or.mDrawable.getLayoutDirection());

                    r.mInsetL = or.mInsetL;

                    r.mInsetT = or.mInsetT;

                    r.mInsetR = or.mInsetR;