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

Commit 728f8b49 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Re-compute IME target after the transition finished"

parents 13eb02f2 359ba05c

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

+1 −7
Original line number Diff line number Diff line
@@ -1037,13 +1037,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                }

            }



            final boolean curDisplayInTransitNotAnimate =

                    // legacy transition

                    (curDisplay.mAppTransition.isRunning() && !curDisplay.isAppTransitioning())

                    // shell transition

                    || (curDisplay.mTransitionController.isShellTransitionsEnabled()

                            && !curDisplay.mTransitionController.isPlaying());

            if (curDisplayInTransitNotAnimate) {

            if (curDisplay.mAppTransition.isRunning() && !curDisplay.isAppTransitioning()) {

                // We have finished the animation of an app transition. To do this, we have

                // delayed a lot of operations like showing and hiding apps, moving apps in

                // Z-order, etc.

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

+5 −0
Original line number Diff line number Diff line
@@ -497,6 +497,11 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
        if (fadeRotationController != null) {

            fadeRotationController.onTransitionFinished();

        }

        // Transient-launch activities cannot be IME target (WindowState#canBeImeTarget),

        // so re-compute in case the IME target is changed after transition.

        if (mTransientLaunches != null) {

            mTargetDisplay.computeImeTarget(true /* updateImeTarget */);

        }

    }



    void abort() {