From 9dc38ec22bee0ebc38ae8ec66209ed05e61b5262 Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Wed, 6 May 2020 10:50:16 -0700
Subject: [PATCH] Show bubble by default when stack expands

Fixes: 155486743
Test: manual
- Select overflow, collapse stack, expand stack -> previously selected
bubble is selected
- Select middle bubble, collapse stack, expand stack -> bubble now first
- Select first bubble, collapse stack, expand stack -> first bubble
still selected

Change-Id: Ie287274abd520219311288ba5d3492dae4b45b9e
---
 .../src/com/android/systemui/bubbles/BubbleStackView.java     | 4 +++-
 1 file changed, 3 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 c802b59faba99..6cdbe2f3ca50b 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -454,7 +454,6 @@ public class BubbleStackView extends FrameLayout
                     // that means overflow was previously expanded. Set the selected bubble
                     // internally without going through BubbleData (which would ignore it since it's
                     // already selected).
-                    mBubbleData.setShowingOverflow(true);
                     setSelectedBubble(clickedBubble);
                 }
             } else {
@@ -1342,7 +1341,10 @@ public class BubbleStackView extends FrameLayout
         }
         if (bubbleToSelect == null || bubbleToSelect.getKey() != BubbleOverflow.KEY) {
             mBubbleData.setShowingOverflow(false);
+        } else {
+            mBubbleData.setShowingOverflow(true);
         }
+
         final BubbleViewProvider previouslySelected = mExpandedBubble;
         mExpandedBubble = bubbleToSelect;
         updatePointerPosition();