diff options
| author | Chris Craik <ccraik@google.com> | 2014-05-06 20:17:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-06 20:17:29 +0000 |
| commit | 55d47f6be8ba5aab8d9d9cc19e3549c354f08e4f (patch) | |
| tree | 22b71152670178654676c42e2f8e4a9cc489a8c4 /core/java/android/view/View.java | |
| parent | ef3b18b10111834e9d9b4887984a4e9b5de8fed9 (diff) | |
| parent | 6c1787cfea03758d4884119d387b348d629c2794 (diff) | |
| download | frameworks_base-55d47f6be8ba5aab8d9d9cc19e3549c354f08e4f.zip frameworks_base-55d47f6be8ba5aab8d9d9cc19e3549c354f08e4f.tar.gz frameworks_base-55d47f6be8ba5aab8d9d9cc19e3549c354f08e4f.tar.bz2 | |
Merge "Fix pivot update rejection logic"
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 6afff4d..3998c04 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -9958,7 +9958,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @attr ref android.R.styleable#View_transformPivotX */ public void setPivotX(float pivotX) { - if (mRenderNode.isPivotExplicitlySet() || pivotX != getPivotX()) { + if (!mRenderNode.isPivotExplicitlySet() || pivotX != getPivotX()) { invalidateViewProperty(true, false); mRenderNode.setPivotX(pivotX); invalidateViewProperty(false, true); @@ -9999,7 +9999,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @attr ref android.R.styleable#View_transformPivotY */ public void setPivotY(float pivotY) { - if (mRenderNode.isPivotExplicitlySet() || pivotY != getPivotY()) { + if (!mRenderNode.isPivotExplicitlySet() || pivotY != getPivotY()) { invalidateViewProperty(true, false); mRenderNode.setPivotY(pivotY); invalidateViewProperty(false, true); |