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

Commit f69425ee authored by Taran Singh's avatar Taran Singh
Browse files

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
parent aa9d95ed

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

+4 −3
Original line number Diff line number Diff line
@@ -1381,7 +1381,8 @@ class WindowStateAnimator { 
            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 @@ class WindowStateAnimator { 
                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();

        }