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

Commit 303e2eaa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix unexpected hide IME cases" into sc-v2-dev am: 52c14670 

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

Change-Id: Id7a97a792347f41a5eb9275436b2ca90968b2f95
parents a2166f12 52c14670

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;

    }