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

Commit ec66ca13 authored by Adrian Roos's avatar Adrian Roos Committed by Automerger Merge Worker
Browse files

Merge "Fix unexpected IME show because of stale... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13699688

Change-Id: I754793e79b5e65be74c326bf5c84a63eea1867e5
parents 9106c6fc c33d71d6

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