From 7577cfda04a48d0f64ced89e4d8982974c44e9f3 Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Thu, 23 Jul 2020 23:44:17 -0500
Subject: [PATCH] Remove deprecated code from stack & expanded view

Bug: 161939484
Test: tap manage menu app settings => stack collapses so fast that
there is no discernable difference between waiting and not waiting for
collapse animation to finish before starting the settings activity

Change-Id: I87b8c4418bd8f99821a2f6221fd35f651a98a748
---
 .../systemui/bubbles/BubbleExpandedView.java  |  9 -----
 .../systemui/bubbles/BubbleStackView.java     | 39 ++-----------------
 2 files changed, 4 insertions(+), 44 deletions(-)

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 b5ad5e6fffec0..c1d6512f5fc5d 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);
                     }
                 });
 
@@ -1792,36 +1791,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