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

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

Browse Source 
This reverts commit 304db43153.

Reason for revert: This CL broke a test: b/153606760
Bug: 153606760
Change-Id: I6034fad7f88de14518ea9f46bf8774e4b8196926
This commit is contained in:
Tiger Huang
2020-04-10 15:10:57 +00:00
parent 304db43153
commit 4fbe677f10
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

@@ -197,6 +197,7 @@ import android.view.ViewRootImpl;
import android.view.WindowInsets;
import android.view.WindowManager;
import android.view.WindowManagerPolicyConstants.PointerEventListener;
import android.window.ITaskOrganizer;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.MetricsLogger;
@@ -3425,10 +3426,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
private void setInputMethodTarget(WindowState target, boolean targetWaitingAnim) {
// Always update control target. This is needed to handle rotation.
// 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);
updateImeControlTarget(target);
if (target == mInputMethodTarget && mInputMethodTargetWaitingAnim == targetWaitingAnim) {
return;
}