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

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

Merge "Fix Stay on 'SELECT INPUT METHOD' page after choosing input method"... 

Merge "Fix Stay on 'SELECT INPUT METHOD' page after choosing input method" into sc-dev am: 0077be7b am: f738c55e

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

Change-Id: I3281c6c62dc3dd964aecc76c689218467e4535c3
parents 76e024fe f738c55e

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

+8 −8
Original line number Original line Diff line number Diff line
@@ -748,16 +748,16 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        // dismissing during the task switching to keep the window focus because IME window has

        // dismissing during the task switching to keep the window focus because IME window has

        // higher window hierarchy, we don't give it focus if the next IME layering target

        // higher window hierarchy, we don't give it focus if the next IME layering target

        // doesn't request IME visible.

        // doesn't request IME visible.

        if (w.mIsImWindow && (mImeLayeringTarget == null

        if (w.mIsImWindow && w.isChildWindow() && (mImeLayeringTarget == null

                || !mImeLayeringTarget.getRequestedVisibility(ITYPE_IME))) {

                || !mImeLayeringTarget.getRequestedVisibility(ITYPE_IME))) {

            if (w.mAttrs.type == TYPE_INPUT_METHOD_DIALOG) {

            return false;

            return false;

        }

        }



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

            if (w.isChildWindow()) {

                && !mImeLayeringTarget.getRequestedVisibility(ITYPE_IME)

                && mImeLayeringTarget.isAnimating(PARENTS | TRANSITION,

                ANIMATION_TYPE_APP_TRANSITION)) {

            return false;

            return false;

        }

        }

        }





        final ActivityRecord activity = w.mActivityRecord;

        final ActivityRecord activity = w.mActivityRecord;

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -2219,6 +2219,9 @@ public class DisplayContentTests extends WindowTestsBase { 
        // request IME visible.

        // request IME visible.

        final WindowState nextImeAppTarget =

        final WindowState nextImeAppTarget =

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

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

        spyOn(nextImeAppTarget);

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

                ANIMATION_TYPE_APP_TRANSITION);

        mDisplayContent.setImeLayeringTarget(nextImeAppTarget);

        mDisplayContent.setImeLayeringTarget(nextImeAppTarget);

        assertNotEquals(imeMenuDialog, mDisplayContent.findFocusedWindow());

        assertNotEquals(imeMenuDialog, mDisplayContent.findFocusedWindow());

    }

    }