diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java index e26aa554dd61a..318a987990130 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java @@ -458,15 +458,6 @@ public class BubbleExpandedView extends LinearLayout { mPointerView.setBackground(mPointerDrawable); } - /** - * Hides the IME if it's showing. This is currently done by dispatching a back press to the AV. - */ - void hideImeIfVisible() { - if (mKeyboardVisible) { - performBackPressIfNeeded(); - } - } - @Override protected void onDetachedFromWindow() { super.onDetachedFromWindow(); diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index ea12c9598b91f..b3fbfd6a0f303 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java @@ -1081,11 +1081,10 @@ public class BubbleStackView extends FrameLayout final Bubble bubble = mBubbleData.getSelectedBubble(); if (bubble != null && mBubbleData.hasBubbleInStackWithKey(bubble.getKey())) { final Intent intent = bubble.getSettingsIntent(mContext); - collapseStack(() -> { - mContext.startActivityAsUser(intent, bubble.getUser()); - logBubbleEvent(bubble, - SysUiStatsLog.BUBBLE_UICHANGED__ACTION__HEADER_GO_TO_SETTINGS); - }); + mBubbleData.setExpanded(false); + mContext.startActivityAsUser(intent, bubble.getUser()); + logBubbleEvent(bubble, + SysUiStatsLog.BUBBLE_UICHANGED__ACTION__HEADER_GO_TO_SETTINGS); } }); @@ -1769,36 +1768,6 @@ public class BubbleStackView extends FrameLayout } } - /** - * Dismiss the stack of bubbles. - * - * @deprecated - */ - @Deprecated - void stackDismissed(int reason) { - if (DEBUG_BUBBLE_STACK_VIEW) { - Log.d(TAG, "stackDismissed: reason=" + reason); - } - mBubbleData.dismissAll(reason); - logBubbleEvent(null /* no bubble associated with bubble stack dismiss */, - SysUiStatsLog.BUBBLE_UICHANGED__ACTION__STACK_DISMISSED); - } - - /** - * @deprecated use {@link #setExpanded(boolean)} and - * {@link BubbleData#setSelectedBubble(Bubble)} - */ - @Deprecated - @MainThread - void collapseStack(Runnable endRunnable) { - if (DEBUG_BUBBLE_STACK_VIEW) { - Log.d(TAG, "collapseStack(endRunnable)"); - } - mBubbleData.setExpanded(false); - // TODO - use the runnable at end of animation - endRunnable.run(); - } - void showExpandedViewContents(int displayId) { if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null