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

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

Merge "Fix unexpected hide IME cases" into sc-v2-dev

parents 9d25f3fb fac4cdfc

core/java/android/view/ImeInsetsSourceConsumer.java

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { 
    public void setControl(@Nullable InsetsSourceControl control, int[] showTypes,

            int[] hideTypes) {

        super.setControl(control, showTypes, hideTypes);

        if (control == null && !mIsRequestedVisibleAwaitingControl) {

        if (control == null && !isRequestedVisibleAwaitingControl()) {

            hide();

            removeSurface();

        }

core/java/android/view/InsetsAnimationControlImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -284,8 +284,8 @@ public class InsetsAnimationControlImpl implements InternalInsetsAnimationContro 
                    mShownOnFinish, mCurrentAlpha, mCurrentInsets));

            mController.notifyFinished(this, mShownOnFinish);

            releaseLeashes();

        }

            if (DEBUG) Log.d(TAG, "Animation finished abruptly.");

        }

        return mFinished;

    }