summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/View.java
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2014-05-06 11:02:39 -0700
committerChris Craik <ccraik@google.com>2014-05-06 11:02:39 -0700
commit6c1787cfea03758d4884119d387b348d629c2794 (patch)
tree666455485241c799754fe625b5c70eda476e7d1c /core/java/android/view/View.java
parent7a70981fc1eead712d62d9502f6dccb963779ae8 (diff)
downloadframeworks_base-6c1787cfea03758d4884119d387b348d629c2794.zip
frameworks_base-6c1787cfea03758d4884119d387b348d629c2794.tar.gz
frameworks_base-6c1787cfea03758d4884119d387b348d629c2794.tar.bz2
Fix pivot update rejection logic
bug:14228573 Change-Id: Ia4c88f878ce325ee961117cf255c971d9947d5c6
Diffstat (limited to 'core/java/android/view/View.java')
-rw-r--r--core/java/android/view/View.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 463a2f7..784b583 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);