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

Commit 26b50d8f authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Rename ImeFocusController#checkFocus() to #onScheduledCheckFocus()"

parents 03ec58ef 42c6de0c

core/java/android/view/ImeFocusController.java

+5 −4
Original line number Diff line number Diff line
@@ -108,10 +108,11 @@ public final class ImeFocusController { 
    }



    /**

     * @see InputMethodManager#checkFocus()

     * @see ViewRootImpl#dispatchCheckFocus()

     */

    void checkFocus(boolean forceNewFocus, boolean startInput) {

        getImmDelegate().checkFocus(forceNewFocus, startInput, mViewRootImpl);

    @UiThread

    void onScheduledCheckFocus() {

        getImmDelegate().onScheduledCheckFocus(mViewRootImpl);

    }



    @UiThread
@@ -163,7 +164,7 @@ public final class ImeFocusController { 
        void onPostWindowGainedFocus(View viewForWindowFocus,

                @NonNull WindowManager.LayoutParams windowAttribute);

        void onViewFocusChanged(@NonNull View view, boolean hasFocus);

        void checkFocus(boolean forceNewFocus, boolean startInput, ViewRootImpl viewRootImpl);

        void onScheduledCheckFocus(@NonNull ViewRootImpl viewRootImpl);

        void onViewDetachedFromWindow(View view, ViewRootImpl viewRootImpl);

        void onWindowDismissed(ViewRootImpl viewRootImpl);

    }

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -5714,7 +5714,7 @@ public final class ViewRootImpl implements ViewParent, 
                    enqueueInputEvent(event, null, 0, true);

                } break;

                case MSG_CHECK_FOCUS: {

                    getImeFocusController().checkFocus(false, true);

                    getImeFocusController().onScheduledCheckFocus();

                } break;

                case MSG_CLOSE_SYSTEM_DIALOGS: {

                    if (mView != null) {

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

+2 −3
Original line number Diff line number Diff line
@@ -825,9 +825,8 @@ public final class InputMethodManager { 
        }



        @Override

        public void checkFocus(boolean forceNewFocus, boolean startInput,

                ViewRootImpl viewRootImpl) {

            checkFocusInternal(forceNewFocus, startInput, viewRootImpl);

        public void onScheduledCheckFocus(@NonNull ViewRootImpl viewRootImpl) {

            checkFocusInternal(false, true, viewRootImpl);

        }



        @Override