commit 027929d22a6d19461199dd749cd524bcdf55f866
author Mady Mellor <madym@google.com> Thu Jun 11 16:35:23 2020 -0700
committer Mady Mellor <madym@google.com> Thu Jun 11 16:55:32 2020 -0700
tree 9cb4309a834463ec86b559f4cdb64661e7dfb9b4
parent 5c71678253626384497367f67c2a17f045485921

Fix IME hanging around

This wasn't being called on the previous bubble which
I think is the issue

Test: manual - have IME up & switch between a bunch of bubbles focusing/
      unfocusing IME over and over again
Fixes: 158674256
Change-Id: I7939a943621712f0d3f1fca5f66766c6b82b3ec6

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
index 088747b..9c701c8 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -1517,6 +1517,12 @@
                 if (previouslySelected != null) {
                     previouslySelected.setContentVisibility(false);
                 }
+                if (previouslySelected != null && previouslySelected.getExpandedView() != null) {
+                    // Hide the currently expanded bubble's IME if it's visible before switching
+                    // to a new bubble.
+                    previouslySelected.getExpandedView().hideImeIfVisible();
+                }
+
                 updateExpandedBubble();
                 requestUpdate();
 
@@ -2430,8 +2436,6 @@
             Log.d(TAG, "updateExpandedBubble()");
         }
 
-        hideImeFromExpandedBubble();
-
         mExpandedViewContainer.removeAllViews();
         if (mIsExpanded && mExpandedBubble != null
                 && mExpandedBubble.getExpandedView() != null) {