Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adrian Roos
2021-03-25 10:37:09 +00:00
committed by Android (Google) Code Review
parent 0207f0791c b081c42791
commit c33d71d602
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/ImeInsetsSourceConsumer.java
View File

@@ -64,8 +64,14 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer {
} }
@Override @Override
void hide(boolean animationFinished, @AnimationType int animationType) { public void hide() {
super.hide(); super.hide();
mIsRequestedVisibleAwaitingControl = false;
}
@Override
void hide(boolean animationFinished, @AnimationType int animationType) {
hide();
if (animationFinished) { if (animationFinished) {
// remove IME surface as IME has finished hide animation. // remove IME surface as IME has finished hide animation.
@@ -122,6 +128,9 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer {
hide(); hide();
removeSurface(); removeSurface();
} }
if (control != null) {
mIsRequestedVisibleAwaitingControl = false;
}
} }
@Override @Override