Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I82e809486787736acd0efe3069abb7339aab23a7
This commit is contained in:
TreeHugger Robot
2020-04-10 18:07:27 +00:00
committed by Automerger Merge Worker
parent 1048073b60 e3b4daa804
commit 8ecb48c193
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -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;
} }