From 027929d22a6d19461199dd749cd524bcdf55f866 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Thu, 11 Jun 2020 16:35:23 -0700 Subject: [PATCH] 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 --- .../src/com/android/systemui/bubbles/BubbleStackView.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index 088747badb0f0..9c701c8ab59ac 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 @@ public class BubbleStackView extends FrameLayout 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 @@ public class BubbleStackView extends FrameLayout Log.d(TAG, "updateExpandedBubble()"); } - hideImeFromExpandedBubble(); - mExpandedViewContainer.removeAllViews(); if (mIsExpanded && mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {