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

Commit febbb2fa authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge "Don't apply remote animation on IME when keyguad is going away." into sc-dev am: 0be68cca 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15105256

Change-Id: I053728dd53c7305c49cd15cd58fb5c59ca8ab065
parents 334b333d 0be68cca

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

+3 −1
Original line number Diff line number Diff line
@@ -99,8 +99,10 @@ class NonAppWindowAnimationAdapter implements AnimationAdapter { 


        final WindowManagerPolicy policy = service.mPolicy;

        service.mRoot.forAllWindows(nonAppWindow -> {

            // Animation on the IME window is controlled via Insets.

            if (nonAppWindow.mActivityRecord == null && policy.canBeHiddenByKeyguardLw(nonAppWindow)

                    && nonAppWindow.wouldBeVisibleIfPolicyIgnored() && !nonAppWindow.isVisible()) {

                    && nonAppWindow.wouldBeVisibleIfPolicyIgnored() && !nonAppWindow.isVisible()

                    && nonAppWindow != service.mRoot.getCurrentInputMethodWindow()) {

                final NonAppWindowAnimationAdapter nonAppAdapter = new NonAppWindowAnimationAdapter(

                        nonAppWindow, durationHint, statusBarTransitionDelay);

                adaptersOut.add(nonAppAdapter);