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

Commit cbeadf8f authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Partly inline ImeFocusController#updateImeFocusable() 

This is mechanical refactoring.  There must be no observable behavior
change.

Bug: 234882948
Test: presubmit
Change-Id: I0c63504fc7fe665f7b7816bdcc7a6cb357482380
parent e128f7da

core/java/android/view/ImeFocusController.java

+4 −8
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ public final class ImeFocusController { 


    @UiThread

    void onTraversal(boolean hasWindowFocus, WindowManager.LayoutParams windowAttribute) {

        final boolean hasImeFocus = updateImeFocusable(windowAttribute, false /* force */);

        final boolean hasImeFocus = WindowManager.LayoutParams.mayUseInputMethod(

                windowAttribute.flags);

        if (!hasWindowFocus || isInLocalFocusMode(windowAttribute)) {

            return;

        }
@@ -90,13 +91,8 @@ public final class ImeFocusController { 
    }



    @UiThread

    boolean updateImeFocusable(WindowManager.LayoutParams windowAttribute, boolean force) {

        final boolean hasImeFocus = WindowManager.LayoutParams.mayUseInputMethod(

                windowAttribute.flags);

        if (force) {

            mHasImeFocus = hasImeFocus;

        }

        return hasImeFocus;

    void updateImeFocusable(WindowManager.LayoutParams windowAttribute) {

        mHasImeFocus = WindowManager.LayoutParams.mayUseInputMethod(windowAttribute.flags);

    }



    @UiThread

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -3798,7 +3798,7 @@ public final class ViewRootImpl implements ViewParent, 
            }



            mAttachInfo.mHasWindowFocus = hasWindowFocus;

            mImeFocusController.updateImeFocusable(mWindowAttributes, true /* force */);

            mImeFocusController.updateImeFocusable(mWindowAttributes);

            mImeFocusController.onPreWindowFocus(hasWindowFocus, mWindowAttributes);



            if (mView != null) {