diff options
author | Alan Viverette <alanv@google.com> | 2014-11-25 00:53:06 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-25 00:53:08 +0000 |
commit | d30f6fba8ba15198a448d12d35e70872dcdf3589 (patch) | |
tree | afe945789e8f228dc6bc660066d825efe2a0c360 /graphics | |
parent | 9be305d146fb422a0e65e5284af2ce081cdc6a69 (diff) | |
parent | 735b75ce274ef7a4c78745844a4269d72cb4feae (diff) | |
download | frameworks_base-d30f6fba8ba15198a448d12d35e70872dcdf3589.zip frameworks_base-d30f6fba8ba15198a448d12d35e70872dcdf3589.tar.gz frameworks_base-d30f6fba8ba15198a448d12d35e70872dcdf3589.tar.bz2 |
Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/java/android/graphics/drawable/RotateDrawable.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/graphics/java/android/graphics/drawable/RotateDrawable.java b/graphics/java/android/graphics/drawable/RotateDrawable.java index 1ee44fb..e1991fe 100644 --- a/graphics/java/android/graphics/drawable/RotateDrawable.java +++ b/graphics/java/android/graphics/drawable/RotateDrawable.java @@ -216,7 +216,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { * @attr ref android.R.styleable#RotateDrawable_pivotX */ public void setPivotX(float pivotX) { - if (mState.mPivotX == pivotX) { + if (mState.mPivotX != pivotX) { mState.mPivotX = pivotX; invalidateSelf(); } @@ -242,7 +242,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { * @see #isPivotXRelative() */ public void setPivotXRelative(boolean relative) { - if (mState.mPivotXRel == relative) { + if (mState.mPivotXRel != relative) { mState.mPivotXRel = relative; invalidateSelf(); } @@ -270,7 +270,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { * @attr ref android.R.styleable#RotateDrawable_pivotY */ public void setPivotY(float pivotY) { - if (mState.mPivotY == pivotY) { + if (mState.mPivotY != pivotY) { mState.mPivotY = pivotY; invalidateSelf(); } @@ -296,7 +296,7 @@ public class RotateDrawable extends Drawable implements Drawable.Callback { * @see #isPivotYRelative() */ public void setPivotYRelative(boolean relative) { - if (mState.mPivotYRel == relative) { + if (mState.mPivotYRel != relative) { mState.mPivotYRel = relative; invalidateSelf(); } |