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

Commit 97c38130 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Update IME focus when the active view is losing the focus. 

Despite the fact that IMM#focusOut() are called from many focus
mangement logics, the reality is that IMM#focusOut() has done
nothing more than 6 years.  This would not a big problem as long
as IMM#focusIn() is called immediately after IMM#focusOut().

However, situations where only IMM#focusOut() is called,
following fields continue keeping object references.
- IMM#mServedView
- IMM#mNextServedView
- IMM#mServedInputConnection
- IMM#mServedInputConnectionWrapper

Even worse, if the IME is showing software keyboard, it will not
be dismissed.

With this CL, IMM#focusOut() starts cleaning up the active IME
session when the associated view loses focus.

This CL also removes IMM#mCurRootView because it is indeed
necessary for above change.  The problem when only introducing
above change can be understood as follows.

1. IMM#mCurRootView is correctly set from ViewRootImpl.
2. IMM#focusIn() is called. InputConnection is established.
3. IMM#focusOut() is called, which triggers
   IMM#finishInputLocked() because of above change, which
   internally clears IMM#mCurRootView.
4. IMM#focusIn() is called but IMM#mCurRootView is still null.
   Because of this the focus-in event is ignored and the
   software keyboard does not show up anymore.

In this CL, we simply check view.hasWindowFocus() instead.
As far as I've tested, this change looks to be working well.

Bug: 20820914
Change-Id: Ib4bd70ce0305a6bde6a929bcc6ad20a2b8402a97
parent e1a1d2e8

core/java/android/view/ViewRootImpl.java

+0 −5
Original line number Diff line number Diff line
@@ -2001,7 +2001,6 @@ public final class ViewRootImpl implements ViewParent, 
                mLastWasImTarget = imTarget;

                InputMethodManager imm = InputMethodManager.peekInstance();

                if (imm != null && imTarget) {

                    imm.startGettingWindowFocus(mView);

                    imm.onWindowFocus(mView, mView.findFocus(),

                            mWindowAttributes.softInputMode,

                            !mHasHadWindowFocus, mWindowAttributes.flags);
@@ -3305,10 +3304,6 @@ public final class ViewRootImpl implements ViewParent, 


                    InputMethodManager imm = InputMethodManager.peekInstance();

                    if (mView != null) {

                        if (hasWindowFocus && imm != null && mLastWasImTarget &&

                                !isInLocalFocusMode()) {

                            imm.startGettingWindowFocus(mView);

                        }

                        mAttachInfo.mKeyDispatchState.reset();

                        mView.dispatchWindowFocusChanged(hasWindowFocus);

                        mAttachInfo.mTreeObserver.dispatchOnWindowFocusChange(hasWindowFocus);

core/java/android/view/inputmethod/InputMethodManager.java

+7 −29
Original line number Diff line number Diff line
@@ -282,11 +282,6 @@ public final class InputMethodManager { 
    

    // -----------------------------------------------------------



    /**

     * This is the root view of the overall window that currently has input

     * method focus.

     */

    View mCurRootView;

    /**

     * This is the view that should currently be served by an input method,

     * regardless of the state of setting that up.
@@ -816,7 +811,6 @@ public final class InputMethodManager { 
     * Disconnect any existing input connection, clearing the served view.

     */

    void finishInputLocked() {

        mCurRootView = null;

        mNextServedView = null;

        if (mServedView != null) {

            if (DEBUG) Log.v(TAG, "FINISH INPUT: " + mServedView);
@@ -1300,10 +1294,9 @@ public final class InputMethodManager { 
    void focusInLocked(View view) {

        if (DEBUG) Log.v(TAG, "focusIn: " + view);

        

        if (mCurRootView != view.getRootView()) {

            // This is a request from a window that isn't in the window with

            // IME focus, so ignore it.

            if (DEBUG) Log.v(TAG, "Not IME target window, ignoring");

        if (!view.hasWindowFocus()) {

            // This is a request from a window that doesn't have window focus, so ignore it.

            if (DEBUG) Log.v(TAG, "Not focused window, ignoring");

            return;

        }
@@ -1320,19 +1313,12 @@ public final class InputMethodManager { 
            if (DEBUG) Log.v(TAG, "focusOut: " + view

                    + " mServedView=" + mServedView

                    + " winFocus=" + view.hasWindowFocus());

            if (mServedView != view) {

                // The following code would auto-hide the IME if we end up

                // with no more views with focus.  This can happen, however,

                // whenever we go into touch mode, so it ends up hiding

                // at times when we don't really want it to.  For now it

                // seems better to just turn it all off.

                if (false && view.hasWindowFocus()) {

            if (mServedView == view && view.hasWindowFocus()) {

                mNextServedView = null;

                scheduleCheckFocusLocked(view);

            }

        }

    }

    }



    static void scheduleCheckFocusLocked(View view) {

        ViewRootImpl viewRootImpl = view.getViewRootImpl();
@@ -1452,13 +1438,6 @@ public final class InputMethodManager { 
        }

    }

    

    /** @hide */

    public void startGettingWindowFocus(View rootView) {

        synchronized (mH) {

            mCurRootView = rootView;

        }

    }

    

    /**

     * Report the current selection range.

     *
@@ -2166,7 +2145,6 @@ public final class InputMethodManager { 
                + " mBindSequence=" + mBindSequence

                + " mCurId=" + mCurId);

        p.println("  mCurMethod=" + mCurMethod);

        p.println("  mCurRootView=" + mCurRootView);

        p.println("  mServedView=" + mServedView);

        p.println("  mNextServedView=" + mNextServedView);

        p.println("  mServedConnecting=" + mServedConnecting);

core/java/android/webkit/FindActionModeCallback.java

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ public class FindActionModeCallback implements ActionMode.Callback, TextWatcher, 
    }



    public void showSoftInput() {

        mInput.startGettingWindowFocus(mEditText.getRootView());

        mInput.focusIn(mEditText);

        mInput.showSoftInput(mEditText, 0);

    }