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

Merge "WindowInsetsAnimation: Fix app driven closing of IME" into rvc-dev am: 56f4b1b9d3

Browse Source 
Change-Id: I42dc07978134b80aea85ae5bb7de24474f5c3b96
This commit is contained in:
Adrian Roos
2020-04-02 13:58:27 +00:00
committed by Automerger Merge Worker
parent bbec0bba6d 56f4b1b9d3
commit 2b8d80b8cb
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,6 @@
package android.view; package android.view;
import static android.view.InsetsController.ANIMATION_TYPE_USER;
import static android.view.InsetsController.AnimationType; import static android.view.InsetsController.AnimationType;
import static android.view.InsetsState.ITYPE_IME; import static android.view.InsetsState.ITYPE_IME;
@@ -104,13 +103,9 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer {
void hide(boolean animationFinished, @AnimationType int animationType) { void hide(boolean animationFinished, @AnimationType int animationType) {
super.hide(); super.hide();
if (!animationFinished) { if (animationFinished) {
if (animationType == ANIMATION_TYPE_USER) {
// if controlWindowInsetsAnimation is hiding keyboard.
notifyHidden();
}
} else {
// remove IME surface as IME has finished hide animation. // remove IME surface as IME has finished hide animation.
notifyHidden();
removeSurface(); removeSurface();
} }
} }