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

Commit 45abb13e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Only use the IME target from IMMS to update the IME control target"" into rvc-dev am: e3b4daa8

Change-Id: Id2062f84318f16ef9d57423ded7da168eab0ef66
parents 39efc0be e3b4daa8

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -198,6 +198,7 @@ import android.view.ViewRootImpl; 
import android.view.WindowInsets;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.view.WindowManager;

import android.view.WindowManagerPolicyConstants.PointerEventListener;

import android.view.WindowManagerPolicyConstants.PointerEventListener;

import android.window.ITaskOrganizer;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsLogger;
@@ -3421,10 +3422,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 




    private void setInputMethodTarget(WindowState target, boolean targetWaitingAnim) {

    private void setInputMethodTarget(WindowState target, boolean targetWaitingAnim) {

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

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

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

        updateImeControlTarget(target);

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

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

            return;

            return;

        }

        }