diff options
author | Alan Viverette <alanv@google.com> | 2014-11-25 18:44:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 18:44:37 +0000 |
commit | c9b68e115091f8cd0fd77590d9d1be2bb0f04953 (patch) | |
tree | 206f74fdef636039adf4000a49d6744c026bc172 /graphics | |
parent | 44a711ccac480aef4e8518284b8a0320e227f2df (diff) | |
parent | df188d4137a9ebf0661127bab36c517a7fb001d5 (diff) | |
download | frameworks_base-c9b68e115091f8cd0fd77590d9d1be2bb0f04953.zip frameworks_base-c9b68e115091f8cd0fd77590d9d1be2bb0f04953.tar.gz frameworks_base-c9b68e115091f8cd0fd77590d9d1be2bb0f04953.tar.bz2 |
am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev
* commit 'df188d4137a9ebf0661127bab36c517a7fb001d5':
Cannot set Pivot X,Y values from setPivotX, setPivotY API
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(); } |