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

Commit a6462766 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix a redundant assignRelativeLayerForIme case"" into tm-dev

parents 8b7f3117 b7d947e7

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

+1 −6
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ 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.SLEEP_TOKENS;

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_WINDOW_ANIMATION;

import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
@@ -5011,11 +5010,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                            ? mImeControlTarget.getWindow().mToken : null;

            final boolean canImeTargetSetRelativeLayer = imeTarget.getSurfaceControl() != null

                    && imeTarget.mToken == imeControlTargetToken

                    && !imeTarget.inMultiWindowMode()

                    // 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

                    // surface be attached on the fullscreen activity.

                    && imeTarget.mAttrs.type != TYPE_BASE_APPLICATION;

                    && !imeTarget.inMultiWindowMode();

            if (canImeTargetSetRelativeLayer) {

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

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

services/tests/wmtests/src/com/android/server/wm/ZOrderingTests.java

+1 −2
Original line number Diff line number Diff line
@@ -293,8 +293,7 @@ public class ZOrderingTests extends WindowTestsBase { 
    public void testAssignWindowLayers_ForImeWithAppTargetAndAppAbove() {

        final WindowState appBelowImeTarget = createWindow("appBelowImeTarget");

        final WindowState imeAppTarget = createWindow("imeAppTarget");

        final WindowState appAboveImeTarget = createWindow(imeAppTarget, TYPE_APPLICATION,

                "appAboveImeTarget");

        final WindowState appAboveImeTarget = createWindow("appAboveImeTarget");



        mDisplayContent.setImeLayeringTarget(imeAppTarget);

        mDisplayContent.setImeControlTarget(imeAppTarget);