Merge "Collpase expanded bubbles when appropriate" (a55b1e9b) · Commits · e / os / android_frameworks_base

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();
		}