Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix IME hanging around" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-12 01:34:19 +00:00
committed by Android (Google) Code Review
parent d48a06e6d9 027929d22a
commit a7ef29df9e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

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