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

This commit is contained in:
Alan Viverette
2014-11-25 00:53:06 +00:00
committed by Android (Google) Code Review

View File

@@ -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();
}