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

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

Merge "Let token animation notify removing starting window" into main

parents 324f4da1 63410892

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

+4 −2
Original line number Diff line number Diff line
@@ -181,8 +181,10 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider { 
        }

        WindowToken imeToken = mWindowContainer.asWindowState() != null

                ? mWindowContainer.asWindowState().mToken : null;

        if (mDisplayContent.getAsyncRotationController() != null

                && mDisplayContent.getAsyncRotationController().isTargetToken(imeToken)) {

        final var rotationController = mDisplayContent.getAsyncRotationController();

        if ((rotationController != null && rotationController.isTargetToken(imeToken))

                || (imeToken != null && imeToken.isSelfAnimating(

                        0 /* flags */, SurfaceAnimator.ANIMATION_TYPE_TOKEN_TRANSFORM))) {

            // Skip reporting IME drawn state when the control target is in fixed

            // rotation, AsyncRotationController will report after the animation finished.

            return;