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

Commit c33d71d6 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Fix unexpected IME show because of stale requestedVisibleAwaitingControl" into sc-dev

parents 0207f079 b081c427

core/java/android/view/ImeInsetsSourceConsumer.java

+10 −1
Original line number Diff line number Diff line
@@ -64,8 +64,14 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { 
    }



    @Override

    void hide(boolean animationFinished, @AnimationType int animationType) {

    public void hide() {

        super.hide();

        mIsRequestedVisibleAwaitingControl = false;

    }



    @Override

    void hide(boolean animationFinished, @AnimationType int animationType) {

        hide();



        if (animationFinished) {

            // remove IME surface as IME has finished hide animation.
@@ -122,6 +128,9 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { 
            hide();

            removeSurface();

        }

        if (control != null) {

            mIsRequestedVisibleAwaitingControl = false;

        }

    }



    @Override