Merge "Show bubble by default when stack expands" into rvc-dev am: d668678adb am: 9efa5f75a8 am: b9b240f0ac am: a6a8b1bd57

Change-Id: I60af2774acddbd3d378d7127fecc3d80025796f9

1 files changed, 3 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
index 341458763625..2cb097f6075e 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 {
@@ -1344,7 +1343,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();