commit f69425eea36145501e6b2a73f0c1606af95593a1
author Taran Singh <tarandeep@google.com> Wed Apr 01 16:57:50 2020 -0700
committer Taran Singh <tarandeep@google.com> Wed Apr 01 16:59:02 2020 -0700
tree 71453a8c85e29540ffd221db9a66ebd14b7d6aa5
parent aa9d95ed9f33a5ab6f7094adb79e9ec330c29c19

Skip IME animation cancellation during rotation

During rotation, IME position doesn't change. So we don't need to cancel
any animation related to IME.

Fix: 152410995
Test: Manually using steps in bug.
Change-Id: I8c9a2ff065de63ac269375a3875411887601bd47

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

diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java
index 563710b..b25383b 100644
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1381,7 +1381,8 @@
             return true;
         }
 
-        if (isEntrance && mWin.mAttrs.type == TYPE_INPUT_METHOD) {
+        final boolean isImeWindow = mWin.mAttrs.type == TYPE_INPUT_METHOD;
+        if (isEntrance && isImeWindow) {
             mWin.getDisplayContent().adjustForImeIfNeeded();
             mWin.setDisplayLayoutNeeded();
             mService.mWindowPlacerLocked.requestTraversal();
@@ -1435,11 +1436,11 @@
                 Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
                 mAnimationIsEntrance = isEntrance;
             }
-        } else {
+        } else if (!isImeWindow) {
             mWin.cancelAnimation();
         }
 
-        if (!isEntrance && mWin.mAttrs.type == TYPE_INPUT_METHOD) {
+        if (!isEntrance && isImeWindow) {
             mWin.getDisplayContent().adjustForImeIfNeeded();
         }