From a4aed0261fb392d52eb0080c532220fc4ddfb54d Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Thu, 1 Dec 2022 11:26:44 -0800
Subject: [PATCH] Ensure the manage menu is closed when the stack collapses

Bug: 255908995
Test: manual - expand the bubble stack, open the manage menu, turn
               off the screen
             - turn on the screen and unlock
             => verify bubbles are collapsed
Change-Id: I9ae1ff43a4c64ce46e4ad8fcbefc93e79c9d7afe
---
 .../Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
index 609ee084f23f1..2b7600cbfe530 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
@@ -1956,6 +1956,7 @@ public class BubbleStackView extends FrameLayout
         if (wasExpanded) {
             stopMonitoringSwipeUpGesture();
             animateCollapse();
+            showManageMenu(false);
             logBubbleEvent(mExpandedBubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__COLLAPSED);
         } else {
             animateExpansion();