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

Merge "Always update IME control target" into rvc-dev am: aae2f6f307 am: 3846e7e8ea

Browse Source 
Change-Id: I143cb96db26e2eea7af884df844de71a587e5b36
This commit is contained in:
Taran Singh
2020-03-23 18:49:37 +00:00
committed by Automerger Merge Worker
parent cc02f9b575 3846e7e8ea
commit e135c59f67
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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