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

Commit 7beb69cd authored by Taran Singh's avatar Taran Singh Committed by Automerger Merge Worker
Browse files

Merge "Always update IME control target" into rvc-dev am: aae2f6f3 am: 3846e7e8 am: e135c59f 

Change-Id: I8e6b9d3960cb9d6eb9abf66160b5d3eca1ab976b
parents 74597929 e135c59f

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

+2 −1
Original line number Diff line number Diff line
@@ -3524,6 +3524,8 @@ 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);

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

            return;

        }
@@ -3531,7 +3533,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        mInputMethodTarget = target;

        mInputMethodTargetWaitingAnim = targetWaitingAnim;

        assignWindowLayers(false /* setLayoutNeeded */);

        updateImeControlTarget(mInputMethodTarget);

        updateImeParent();

    }