Merge "Handle IME hide internal state correctly." into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-03-19 23:08:57 +00:00
committed by Android (Google) Code Review

View File

@@ -878,8 +878,7 @@ public class InputMethodService extends AbstractInputMethodService {
} }
private void notifyImeHidden() { private void notifyImeHidden() {
setImeWindowStatus(IME_ACTIVE | IME_INVISIBLE, mBackDisposition); doHideWindow();
onPreRenderedWindowVisibilityChanged(false /* setVisible */);
} }
private void removeImeSurface() { private void removeImeSurface() {
@@ -2284,7 +2283,9 @@ public class InputMethodService extends AbstractInputMethodService {
if (mDecorViewVisible) { if (mDecorViewVisible) {
// When insets API is enabled, it is responsible for client and server side // When insets API is enabled, it is responsible for client and server side
// visibility of IME window. // visibility of IME window.
if (!isVisibilityAppliedUsingInsetsConsumer()) { if (isVisibilityAppliedUsingInsetsConsumer()) {
mInputView.dispatchWindowVisibilityChanged(View.GONE);
} else {
mWindow.hide(); mWindow.hide();
} }
mDecorViewVisible = false; mDecorViewVisible = false;