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

Commit 79420036 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I49665b38,I0c63504f 

* changes:
  Merge updateImeFocusable() into onPostWindowFocus()
  Partly inline ImeFocusController#updateImeFocusable()
parents e739ddf5 f324eaba

core/java/android/view/ImeFocusController.java

+3 −11
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;

        }
@@ -83,22 +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

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

        final boolean hasImeFocus = WindowManager.LayoutParams.mayUseInputMethod(

                windowAttribute.flags);

        if (force) {

            mHasImeFocus = hasImeFocus;

        }

        return hasImeFocus;

    }



    @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, true /* force */);

            mImeFocusController.onPreWindowFocus(hasWindowFocus, mWindowAttributes);



            if (mView != null) {