Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55d47f6b authored by Chris Craik's avatar Chris Craik Committed by Android (Google) Code Review
Browse files

Merge "Fix pivot update rejection logic"

parents ef3b18b1 6c1787cf

core/java/android/view/View.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -9958,7 +9958,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @attr ref android.R.styleable#View_transformPivotX

     * @attr ref android.R.styleable#View_transformPivotX

     */

     */

    public void setPivotX(float pivotX) {

    public void setPivotX(float pivotX) {

        if (mRenderNode.isPivotExplicitlySet() || pivotX != getPivotX()) {

        if (!mRenderNode.isPivotExplicitlySet() || pivotX != getPivotX()) {

            invalidateViewProperty(true, false);

            invalidateViewProperty(true, false);

            mRenderNode.setPivotX(pivotX);

            mRenderNode.setPivotX(pivotX);

            invalidateViewProperty(false, true);

            invalidateViewProperty(false, true);
@@ -9999,7 +9999,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @attr ref android.R.styleable#View_transformPivotY

     * @attr ref android.R.styleable#View_transformPivotY

     */

     */

    public void setPivotY(float pivotY) {

    public void setPivotY(float pivotY) {

        if (mRenderNode.isPivotExplicitlySet() || pivotY != getPivotY()) {

        if (!mRenderNode.isPivotExplicitlySet() || pivotY != getPivotY()) {

            invalidateViewProperty(true, false);

            invalidateViewProperty(true, false);

            mRenderNode.setPivotY(pivotY);

            mRenderNode.setPivotY(pivotY);

            invalidateViewProperty(false, true);

            invalidateViewProperty(false, true);