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

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

Browse Source
This commit is contained in:
Tiger Huang
2020-04-08 20:45:59 +00:00
committed by Android (Google) Code Review
parent 693c69ca30 304db43153
commit b7dda7d9d5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3421,7 +3421,10 @@ 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.
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) { if (target == mInputMethodTarget && mInputMethodTargetWaitingAnim == targetWaitingAnim) {
return; return;
} }