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

Commit 111b378a authored by Rob Carr's avatar Rob Carr Committed by Android Git Automerger
Browse files

am 575b629e: Merge "WindowStateAnimation: Clear transformation clip rect." into mnc-dr-dev 

* commit '575b629e':
  WindowStateAnimation: Clear transformation clip rect.
parents 627bc805 575b629e

services/core/java/com/android/server/wm/WindowStateAnimator.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1064,6 +1064,8 @@ class WindowStateAnimator { 
                mAnimator.getScreenRotationAnimationLocked(displayId);

                mAnimator.getScreenRotationAnimationLocked(displayId);

        final boolean screenAnimation =

        final boolean screenAnimation =

                screenRotationAnimation != null && screenRotationAnimation.isAnimating();

                screenRotationAnimation != null && screenRotationAnimation.isAnimating();



        mHasClipRect = false;

        if (selfTransformation || attachedTransformation != null

        if (selfTransformation || attachedTransformation != null

                || appTransformation != null || screenAnimation) {

                || appTransformation != null || screenAnimation) {

            // cache often used attributes locally

            // cache often used attributes locally
@@ -1139,7 +1141,6 @@ class WindowStateAnimator { 
            // transforming since it is more important to have that

            // transforming since it is more important to have that

            // animation be smooth.

            // animation be smooth.

            mShownAlpha = mAlpha;

            mShownAlpha = mAlpha;

            mHasClipRect = false;

            if (!mService.mLimitedAlphaCompositing

            if (!mService.mLimitedAlphaCompositing

                    || (!PixelFormat.formatHasAlpha(mWin.mAttrs.format)

                    || (!PixelFormat.formatHasAlpha(mWin.mAttrs.format)

                    || (mWin.isIdentityMatrix(mDsDx, mDtDx, mDsDy, mDtDy)

                    || (mWin.isIdentityMatrix(mDsDx, mDtDx, mDsDy, mDtDy)