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

Commit df188d41 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev 

* commit 'd30f6fba':
  Cannot set Pivot X,Y values from setPivotX, setPivotY API
parents 9f692b52 d30f6fba

graphics/java/android/graphics/drawable/RotateDrawable.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { 
     * @attr ref android.R.styleable#RotateDrawable_pivotX

     * @attr ref android.R.styleable#RotateDrawable_pivotX

     */

     */

    public void setPivotX(float pivotX) {

    public void setPivotX(float pivotX) {

        if (mState.mPivotX == pivotX) {

        if (mState.mPivotX != pivotX) {

            mState.mPivotX = pivotX;

            mState.mPivotX = pivotX;

            invalidateSelf();

            invalidateSelf();

        }

        }
@@ -242,7 +242,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { 
     * @see #isPivotXRelative()

     * @see #isPivotXRelative()

     */

     */

    public void setPivotXRelative(boolean relative) {

    public void setPivotXRelative(boolean relative) {

        if (mState.mPivotXRel == relative) {

        if (mState.mPivotXRel != relative) {

            mState.mPivotXRel = relative;

            mState.mPivotXRel = relative;

            invalidateSelf();

            invalidateSelf();

        }

        }
@@ -270,7 +270,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { 
     * @attr ref android.R.styleable#RotateDrawable_pivotY

     * @attr ref android.R.styleable#RotateDrawable_pivotY

     */

     */

    public void setPivotY(float pivotY) {

    public void setPivotY(float pivotY) {

        if (mState.mPivotY == pivotY) {

        if (mState.mPivotY != pivotY) {

            mState.mPivotY = pivotY;

            mState.mPivotY = pivotY;

            invalidateSelf();

            invalidateSelf();

        }

        }
@@ -296,7 +296,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { 
     * @see #isPivotYRelative()

     * @see #isPivotYRelative()

     */

     */

    public void setPivotYRelative(boolean relative) {

    public void setPivotYRelative(boolean relative) {

        if (mState.mPivotYRel == relative) {

        if (mState.mPivotYRel != relative) {

            mState.mPivotYRel = relative;

            mState.mPivotYRel = relative;

            invalidateSelf();

            invalidateSelf();

        }

        }