diff options
| -rw-r--r-- | core/java/android/view/InsetsController.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java index 0a2810fb3b7a..ef9edc6c0741 100644 --- a/core/java/android/view/InsetsController.java +++ b/core/java/android/view/InsetsController.java @@ -745,6 +745,10 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation consumer.getType(), animationType, consumer.isRequestedVisible())); continue; } + if (fromIme && animationType == ANIMATION_TYPE_USER) { + // App is already controlling the IME, don't cancel it. + continue; + } typesReady |= InsetsState.toPublicType(consumer.getType()); } if (DEBUG) Log.d(TAG, "show typesReady: " + typesReady); |