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

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

Change-Id: I754793e79b5e65be74c326bf5c84a63eea1867e5
This commit is contained in:
Adrian Roos
2021-03-25 11:10:41 +00:00
committed by Automerger Merge Worker

View File

@@ -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