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

Commit 01cfb049 authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Only use the IME target from IMMS to update the IME control target"... 

Merge "Only use the IME target from IMMS to update the IME control target" into rvc-dev am: b7dda7d9 am: b6e6c540 am: 97283122

Change-Id: I0d9b393540d604e51b9778425f683df02221a330
parents e2b6b670 97283122

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

+4 −1
Original line number Diff line number Diff line
@@ -3421,7 +3421,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 


    private void setInputMethodTarget(WindowState target, boolean targetWaitingAnim) {

        // Always update control target. This is needed to handle rotation.

        updateImeControlTarget(target);

        // We cannot set target as the control target, because mInputMethodTarget can only help

        // decide the z-order of IME, but cannot control IME. Only the IME target reported from

        // updateInputMethodTargetWindow can control IME.

        updateImeControlTarget(mInputMethodControlTarget);

        if (target == mInputMethodTarget && mInputMethodTargetWaitingAnim == targetWaitingAnim) {

            return;

        }