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

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

Merge updateImeFocusable() into onPostWindowFocus() 

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

Bug: 234882948
Test: presubmit
Change-Id: I49665b3832de75238243227acc76be58dceb50fc
parent cbeadf8f

core/java/android/view/ImeFocusController.java

+1 −5
Original line number Diff line number Diff line
@@ -84,17 +84,13 @@ public final class ImeFocusController { 


    @UiThread

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

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

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

            return;

        }

        getImmDelegate().onPreWindowGainedFocus(mViewRootImpl);

    }



    @UiThread

    void updateImeFocusable(WindowManager.LayoutParams windowAttribute) {

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

    }



    @UiThread

    void onPostWindowFocus(View focusedView, boolean hasWindowFocus,

            WindowManager.LayoutParams windowAttribute) {

core/java/android/view/ViewRootImpl.java

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



            mAttachInfo.mHasWindowFocus = hasWindowFocus;

            mImeFocusController.updateImeFocusable(mWindowAttributes);

            mImeFocusController.onPreWindowFocus(hasWindowFocus, mWindowAttributes);



            if (mView != null) {