Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99108322 authored by Mark Renouf's avatar Mark Renouf
Browse files

Collpase expanded bubbles when appropriate 

Calls collapseStack() when:

  Statusar.animateCollapsePanels()
      (when StatusBar panel itself is not expanded)
  Broadcast: ACTION_CLOSE_SYSTEM_DIALOGS
  Broadcast: ACTION_SCREEN_OFF

Bug: 123631742
Test: manual, using go/bubbles-app
Change-Id: I40c68a7fc1baac102e481bf5f0d06c9c24bcc252
parent c20de154

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+8 −0
Original line number Diff line number Diff line
@@ -1892,6 +1892,8 @@ public class StatusBar extends SystemUI implements DemoMode, 


            mStatusBarWindow.cancelExpandHelper();

            mStatusBarView.collapsePanel(true /* animate */, delayed, speedUpFactor);

        } else {

            mBubbleController.collapseStack();

        }

    }
@@ -2532,6 +2534,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
                if (mRemoteInputManager.getController() != null) {

                    mRemoteInputManager.getController().closeRemoteInputs();

                }

                if (mBubbleController.isStackExpanded()) {

                    mBubbleController.collapseStack();

                }

                if (mLockscreenUserManager.isCurrentProfile(getSendingUserId())) {

                    int flags = CommandQueue.FLAG_EXCLUDE_NONE;

                    String reason = intent.getStringExtra("reason");
@@ -2545,6 +2550,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
                if (mStatusBarWindowController != null) {

                    mStatusBarWindowController.setNotTouchable(false);

                }

                if (mBubbleController.isStackExpanded()) {

                    mBubbleController.collapseStack();

                }

                finishBarAnimations();

                resetUserExpandedStates();

            }