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

Commit a8b952cc authored by Taran Singh's avatar Taran Singh Committed by Automerger Merge Worker
Browse files

Merge "Skip IME animation cancellation during rotation" into rvc-dev am: 992c347b am: e4d48426 

Change-Id: I96d6244b27abf9385dcd6876bad73303a7fd32bc
parents ee56506a e4d48426

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -1381,7 +1381,8 @@ class WindowStateAnimator { 
            return true;

            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.getDisplayContent().adjustForImeIfNeeded();

            mWin.setDisplayLayoutNeeded();

            mWin.setDisplayLayoutNeeded();

            mService.mWindowPlacerLocked.requestTraversal();

            mService.mWindowPlacerLocked.requestTraversal();
@@ -1435,11 +1436,11 @@ class WindowStateAnimator { 
                Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

                Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

                mAnimationIsEntrance = isEntrance;

                mAnimationIsEntrance = isEntrance;

            }

            }

        } else {

        } else if (!isImeWindow) {

            mWin.cancelAnimation();

            mWin.cancelAnimation();

        }

        }





        if (!isEntrance && mWin.mAttrs.type == TYPE_INPUT_METHOD) {

        if (!isEntrance && isImeWindow) {

            mWin.getDisplayContent().adjustForImeIfNeeded();

            mWin.getDisplayContent().adjustForImeIfNeeded();

        }

        }