Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd30f6fba8ba15198a448d12d35e70872dcdf3589':
  Cannot set Pivot X,Y values from setPivotX, setPivotY API
This commit is contained in:
Alan Viverette
2014-11-25 00:56:05 +00:00
committed by Android Git Automerger
parent 9f692b5202 d30f6fba8b
commit df188d4137
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/java/android/graphics/drawable/RotateDrawable.java
View File

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