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

Commit 00d6a76c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am a55097f8: am ed74c10f: am aae329ef: Merge "Don\'t apply transformation... 

am a55097f8: am ed74c10f: am aae329ef: Merge "Don\'t apply transformation fudge when not rotating." into jb-mr1.1-dev

* commit 'a55097f8':
  Don't apply transformation fudge when not rotating.
parents db69db15 a55097f8

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
@@ -883,7 +883,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