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

Commit aae329ef authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Don't apply transformation fudge when not rotating." into jb-mr1.1-dev

parents ebec2315 4b16969b

services/java/com/android/server/wm/ScreenRotationAnimation.java

+4 −0
Original line number Diff line number Diff line
@@ -668,6 +668,10 @@ class ScreenRotationAnimation { 
        return hasAnimations() || (TWO_PHASE_ANIMATION && mFinishAnimReady);

    }



    public boolean isRotating() {

        return mCurRotation != mOriginalRotation;

    }



    private boolean hasAnimations() {

        return (TWO_PHASE_ANIMATION &&

                    (mStartEnterAnimation != null || mStartExitAnimation != null

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

+1 −1
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ class WindowStateAnimator { 
            final Matrix tmpMatrix = mWin.mTmpMatrix;



            // Compute the desired transformation.

            if (screenAnimation) {

            if (screenAnimation && screenRotationAnimation.isRotating()) {

                // If we are doing a screen animation, the global rotation

                // applied to windows can result in windows that are carefully

                // aligned with each other to slightly separate, allowing you