Merge "Fix pivot update rejection logic" (55d47f6b) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);