Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e68d6f53 authored by Taran Singh's avatar Taran Singh
Browse files

Handle IME hide internal state correctly. 

IME process is notified after client has hidden the IME. At this point
IME should call doHideWindow() so internal lifecycle methods are called
the way they were called earlier.
Also, with insets we don't hide the decorView of IME window till client
is unbound, so to be consistent with previous behavior, call
windowVisibilityChanged(View.GONE) explicitly.

Fix: 151125925
Test: atest KeyboardVisibilityTest InputMethodServiceTest
Change-Id: Ibe9a02b93489370b6ae9b497993e366f88791a62
parent e88d949e

core/java/android/inputmethodservice/InputMethodService.java

+4 −3
Original line number Diff line number Diff line
@@ -878,8 +878,7 @@ public class InputMethodService extends AbstractInputMethodService { 
    }



    private void notifyImeHidden() {

        setImeWindowStatus(IME_ACTIVE | IME_INVISIBLE, mBackDisposition);

        onPreRenderedWindowVisibilityChanged(false /* setVisible */);

        doHideWindow();

    }



    private void removeImeSurface() {
@@ -2284,7 +2283,9 @@ public class InputMethodService extends AbstractInputMethodService { 
        if (mDecorViewVisible) {

            // When insets API is enabled, it is responsible for client and server side

            // visibility of IME window.

            if (!isVisibilityAppliedUsingInsetsConsumer()) {

            if (isVisibilityAppliedUsingInsetsConsumer()) {

                mInputView.dispatchWindowVisibilityChanged(View.GONE);

            } else {

                mWindow.hide();

            }

            mDecorViewVisible = false;