commit 2f3debc0e7e83a09baee312a04f9e84207b2467e
author Cosmin Băieș <cosminbaies@google.com> Mon Apr 08 13:12:44 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 08 13:12:44 2024 +0000
tree 01cbbb89d62601b7a0255d8d3ad161121dd80e24
parent 725754906746dbe8a537a75c4ed7fe8ed5c8e6b6
parent d2bfeca17b595ffbfb9dee034eafcff25d36a104

Merge "Reset IME visible types only when losing control" into main

core/java/android/view/ImeInsetsSourceConsumer.java

diff --git a/core/java/android/view/ImeInsetsSourceConsumer.java b/core/java/android/view/ImeInsetsSourceConsumer.java
index b300022..6caf4d6 100644
--- a/core/java/android/view/ImeInsetsSourceConsumer.java
+++ b/core/java/android/view/ImeInsetsSourceConsumer.java
@@ -196,11 +196,11 @@
         if (!super.setControl(control, showTypes, hideTypes)) {
             return false;
         }
-        final boolean hasLeash = control != null && control.getLeash() != null;
-        if (!hasLeash && !mIsRequestedVisibleAwaitingLeash) {
+        if (control == null && !mIsRequestedVisibleAwaitingLeash) {
             mController.setRequestedVisibleTypes(0 /* visibleTypes */, getType());
             removeSurface();
         }
+        final boolean hasLeash = control != null && control.getLeash() != null;
         if (hasLeash) {
             mIsRequestedVisibleAwaitingLeash = false;
         }