Merge "Transfer IME target right away if old target was home" into rvc-dev am: 3fdab33548 am: 9247fcf186

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11992999

Change-Id: Ifa1ea9fa7d8bfbbf5d94d5121848be0823ca1fc0
This commit is contained in:
TreeHugger Robot
2020-06-25 21:47:18 +00:00
committed by Automerger Merge Worker

View File

@@ -3437,9 +3437,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
"Proposed new IME target: " + target + " for display: " + getDisplayId());
// Now, a special case -- if the last target's window is in the process of exiting, but
// not removed, keep on the last target to avoid IME flicker.
// not removed, keep on the last target to avoid IME flicker. The exception is if the
// current target is home since we want opening apps to become the IME target right away.
if (curTarget != null && !curTarget.mRemoved && curTarget.isDisplayedLw()
&& curTarget.isClosing()) {
&& curTarget.isClosing() && !curTarget.isActivityTypeHome()) {
if (DEBUG_INPUT_METHOD) Slog.v(TAG_WM, "Not changing target till current window is"
+ " closing and not removed");
return curTarget;