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

Commit da78c9e2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove isAnimating check in assignRelativeLayerForIme" into tm-dev

parents 313009c2 0ffa46bd

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

+1 −8
Original line number Original line Diff line number Diff line
@@ -128,7 +128,6 @@ import static com.android.server.wm.DisplayContentProto.RESUMED_ACTIVITY; 
import static com.android.server.wm.DisplayContentProto.ROOT_DISPLAY_AREA;

import static com.android.server.wm.DisplayContentProto.ROOT_DISPLAY_AREA;

import static com.android.server.wm.DisplayContentProto.SCREEN_ROTATION_ANIMATION;

import static com.android.server.wm.DisplayContentProto.SCREEN_ROTATION_ANIMATION;

import static com.android.server.wm.DisplayContentProto.SLEEP_TOKENS;

import static com.android.server.wm.DisplayContentProto.SLEEP_TOKENS;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION;

import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION;
@@ -5001,10 +5000,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        // docked divider while keeping the app itself below the docked divider, so instead

        // docked divider while keeping the app itself below the docked divider, so instead

        // we will put the docked divider below the IME. @see #assignRelativeLayerForImeTargetChild

        // we will put the docked divider below the IME. @see #assignRelativeLayerForImeTargetChild

        //

        //

        // In the case the IME target is animating, the animation Z order may be different

        // than the WindowContainer Z order, so it's difficult to be sure we have the correct

        // IME target. In this case we just layer the IME over its parent surface.

        //

        // In the case where we have no IME target we let its window parent to place it.

        // In the case where we have no IME target we let its window parent to place it.

        //

        //

        // Keep IME window in surface parent as long as app's starting window

        // Keep IME window in surface parent as long as app's starting window
@@ -5020,9 +5015,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                    // We don't need to set relative layer if the IME target in non-multi-window

                    // We don't need to set relative layer if the IME target in non-multi-window

                    // mode is the activity main window since updateImeParent will ensure the IME

                    // mode is the activity main window since updateImeParent will ensure the IME

                    // surface be attached on the fullscreen activity.

                    // surface be attached on the fullscreen activity.

                    && imeTarget.mAttrs.type != TYPE_BASE_APPLICATION

                    && imeTarget.mAttrs.type != TYPE_BASE_APPLICATION;

                    && imeTarget.mToken.getActivity(app -> app.isAnimating(TRANSITION | PARENTS,

                            ANIMATION_TYPE_ALL & ~ANIMATION_TYPE_RECENTS)) == null;

            if (canImeTargetSetRelativeLayer) {

            if (canImeTargetSetRelativeLayer) {

                mImeWindowsContainer.assignRelativeLayer(t, imeTarget.getSurfaceControl(),

                mImeWindowsContainer.assignRelativeLayer(t, imeTarget.getSurfaceControl(),

                        // TODO: We need to use an extra level on the app surface to ensure

                        // TODO: We need to use an extra level on the app surface to ensure