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

Commit ccfe5fad authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android (Google) Code Review
Browse files

Merge "Apply window position translation after app transforms."

parents c2f61b77 9ca40b7a

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

+4 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,6 @@ class WindowStateAnimator { 
            if (selfTransformation) {

                tmpMatrix.postConcat(mTransformation.getMatrix());

            }

            tmpMatrix.postTranslate(frame.left + mWin.mXOffset, frame.top + mWin.mYOffset);

            if (attachedTransformation != null) {

                tmpMatrix.postConcat(attachedTransformation.getMatrix());

            }
@@ -1100,6 +1099,10 @@ class WindowStateAnimator { 
            if (screenAnimation) {

                tmpMatrix.postConcat(screenRotationAnimation.getEnterTransformation().getMatrix());

            }

            // The translation that applies the position of the window needs to be applied at the

            // end in case that other translations include scaling. Otherwise the scaling will

            // affect this translation.

            tmpMatrix.postTranslate(frame.left + mWin.mXOffset, frame.top + mWin.mYOffset);



            //TODO (multidisplay): Magnification is supported only for the default display.

            if (mService.mAccessibilityController != null && displayId == Display.DEFAULT_DISPLAY) {