From 7be4c6166b3cd34d1d64cd474f3f5ed52e841968 Mon Sep 17 00:00:00 2001
From: Joshua Tsuji <tsuji@google.com>
Date: Wed, 4 Mar 2020 14:58:14 -0500
Subject: [PATCH] Fix inability to return to selected bubble after opening
 overflow.

Test: Expand the stack, tap overflow, tap the previously selected bubble, observe that it expands the previous bubble instead of doing nothing.
Fixes: 150791968
Change-Id: Ibe43fd744b818744182f6f70d7126daab02bd185
---
 .../android/systemui/bubbles/BubbleStackView.java    | 12 ++++++++++++
 .../android/systemui/bubbles/BubbleTouchHandler.java |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
index aedd2db738ee0..10b90f28d893a 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -1421,6 +1421,18 @@ public class BubbleStackView extends FrameLayout {
         hideDismissTarget();
     }
 
+    /** Expands the clicked bubble. */
+    public void expandBubble(Bubble bubble) {
+        if (bubble.equals(mBubbleData.getSelectedBubble())) {
+            // If the bubble we're supposed to expand is the selected bubble, that means the
+            // overflow bubble is currently expanded. Don't tell BubbleData to set this bubble as
+            // selected, since it already is. Just call the stack's setSelectedBubble to expand it.
+            setSelectedBubble(bubble);
+        } else {
+            mBubbleData.setSelectedBubble(bubble);
+        }
+    }
+
     void onDragStart() {
         if (DEBUG_BUBBLE_STACK_VIEW) {
             Log.d(TAG, "onDragStart()");
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java
index 0c5bef4d2bded..132c45fab3d2f 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java
@@ -189,7 +189,7 @@ class BubbleTouchHandler implements View.OnTouchListener {
                     if (key == BubbleOverflow.KEY) {
                         mStack.showOverflow();
                     } else {
-                        mBubbleData.setSelectedBubble(mBubbleData.getBubbleWithKey(key));
+                        mStack.expandBubble(mBubbleData.getBubbleWithKey(key));
                     }
                 }
                 resetForNextGesture();