Merge "Fix IME hanging around" into rvc-dev (a7ef29df) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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) {