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

Commit 1c82573e authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

Merge "Use isVisibleRequested to replace with isAnimating for IME picker... 

Merge "Use isVisibleRequested to replace with isAnimating for IME picker dialog" into tm-qpr-dev am: a1671c04 am: f0da2613

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



Change-Id: I5fde27803965a6cabd2a6a4a7d772832738aa4bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ce3fdba f0da2613

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

+1 −3
Original line number Diff line number Diff line
@@ -130,7 +130,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.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_WINDOW_ANIMATION;

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

import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
@@ -758,8 +757,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        }

        if (w.mAttrs.type == TYPE_INPUT_METHOD_DIALOG && mImeLayeringTarget != null

                && !mImeLayeringTarget.getRequestedVisibility(ITYPE_IME)

                && mImeLayeringTarget.isAnimating(PARENTS | TRANSITION,

                ANIMATION_TYPE_APP_TRANSITION)) {

                && !mImeLayeringTarget.isVisibleRequested()) {

            return false;

        }

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

+4 −8
Original line number Diff line number Diff line
@@ -78,10 +78,8 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; 
import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;

import static com.android.server.wm.ActivityTaskSupervisor.ON_TOP;

import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING;

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

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

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

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

import static com.android.server.wm.WindowContainer.POSITION_TOP;

import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;
@@ -2426,7 +2424,7 @@ public class DisplayContentTests extends WindowTestsBase { 
    @Test

    public void testImeMenuDialogFocusWhenImeLayeringTargetChanges() {

        final WindowState imeMenuDialog =

                createWindow(mImeWindow, TYPE_INPUT_METHOD_DIALOG, "imeMenuDialog");

                createWindow(null, TYPE_INPUT_METHOD_DIALOG, "imeMenuDialog");

        makeWindowVisibleAndDrawn(imeMenuDialog, mImeWindow);

        assertTrue(imeMenuDialog.canReceiveKeys());

        mDisplayContent.setInputMethodWindowLocked(mImeWindow);
@@ -2439,13 +2437,11 @@ public class DisplayContentTests extends WindowTestsBase { 
        doReturn(true).when(imeAppTarget).getRequestedVisibility(ITYPE_IME);

        assertEquals(imeMenuDialog, mDisplayContent.findFocusedWindow());



        // Verify imeMenuDialog doesn't be focused window if the next IME target does not

        // request IME visible.

        // Verify imeMenuDialog doesn't be focused window if the next IME target is closing.

        final WindowState nextImeAppTarget =

                createWindow(null, TYPE_BASE_APPLICATION, mDisplayContent, "nextImeAppTarget");

        spyOn(nextImeAppTarget);

        doReturn(true).when(nextImeAppTarget).isAnimating(PARENTS | TRANSITION,

                ANIMATION_TYPE_APP_TRANSITION);

        makeWindowVisibleAndDrawn(nextImeAppTarget);

        nextImeAppTarget.mActivityRecord.commitVisibility(false, false);

        mDisplayContent.setImeLayeringTarget(nextImeAppTarget);

        assertNotEquals(imeMenuDialog, mDisplayContent.findFocusedWindow());

    }