diff options
| -rw-r--r-- | services/java/com/android/server/wm/ScreenRotationAnimation.java | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/wm/WindowStateAnimator.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/ScreenRotationAnimation.java b/services/java/com/android/server/wm/ScreenRotationAnimation.java index 8d2e2e8..cfcf841 100644 --- a/services/java/com/android/server/wm/ScreenRotationAnimation.java +++ b/services/java/com/android/server/wm/ScreenRotationAnimation.java @@ -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 diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java index e33b7b7..d7fcc67 100644 --- a/services/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/java/com/android/server/wm/WindowStateAnimator.java @@ -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 |