Merge "Fix IME hanging around" into rvc-dev am: a7ef29df9e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844159

Change-Id: Id5d03be043c9b77a57ddfea0b1d733977ede1f1c
This commit is contained in:
TreeHugger Robot
2020-06-12 01:54:21 +00:00
committed by Automerger Merge Worker

View File

@@ -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();
@@ -2433,8 +2439,6 @@ public class BubbleStackView extends FrameLayout
Log.d(TAG, "updateExpandedBubble()");
}
hideImeFromExpandedBubble();
mExpandedViewContainer.removeAllViews();
if (mIsExpanded && mExpandedBubble != null
&& mExpandedBubble.getExpandedView() != null) {