Merge "Restore the last IME visiblity of the app window when allowed" into sc-dev am: 02116c6a4f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f950de6ab4d8927a58bef777a4a11e25fccc5a8
This commit is contained in:
Ming-Shin Lu
2021-03-03 14:46:37 +00:00
committed by Automerger Merge Worker
6 changed files with 57 additions and 3 deletions

View File

@@ -116,8 +116,9 @@ public final class ImeFocusController {
if (!hasWindowFocus || !mHasImeFocus || isInLocalFocusMode(windowAttribute)) {
return;
}
View viewForWindowFocus = focusedView != null ? focusedView : mViewRootImpl.mView;
if (DEBUG) {
Log.v(TAG, "onWindowFocus: " + focusedView
Log.v(TAG, "onWindowFocus: " + viewForWindowFocus
+ " softInputMode=" + InputMethodDebug.softInputModeToString(
windowAttribute.softInputMode));
}
@@ -128,8 +129,8 @@ public final class ImeFocusController {
if (DEBUG) Log.v(TAG, "Restarting due to isRestartOnNextWindowFocus as true");
forceFocus = true;
}
// Update mNextServedView when focusedView changed.
final View viewForWindowFocus = focusedView != null ? focusedView : mViewRootImpl.mView;
onViewFocusChanged(viewForWindowFocus, true);
// Starting new input when the next focused view is same as served view but the currently