Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 801b2f18 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5bb43a1e7c39b68239946bc1279a4963b65d3710
parents fbb99a3d a7ef29df

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

+6 −2
Original line number Diff line number Diff line
@@ -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) {