Merge "Fix issue where back button causes shade to appear over bouncer." into tm-qpr-dev (1097ed3c) · Commits · e / os / android_frameworks_base

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -3252,9 +3252,13 @@ public class CentralSurfaces extends CoreStartable implements
		}

		public boolean onBackPressed() {
		boolean isScrimmedBouncer = mScrimController.getState() == ScrimState.BOUNCER_SCRIMMED;
		if (mStatusBarKeyguardViewManager.onBackPressed(isScrimmedBouncer /* hideImmediately */)) {
		if (isScrimmedBouncer) {
		final boolean isScrimmedBouncer =
		mScrimController.getState() == ScrimState.BOUNCER_SCRIMMED;
		final boolean isBouncerOverDream = isBouncerShowingOverDream();

		if (mStatusBarKeyguardViewManager.onBackPressed(
		isScrimmedBouncer \|\| isBouncerOverDream /* hideImmediately */)) {
		if (isScrimmedBouncer \|\| isBouncerOverDream) {
		mStatusBarStateController.setLeaveOpenOnKeyguardHide(false);
		} else {
		mNotificationPanelViewController.expandWithoutQs();
		@@ -3276,7 +3280,8 @@ public class CentralSurfaces extends CoreStartable implements
		if (mNotificationPanelViewController.closeUserSwitcherIfOpen()) {
		return true;
		}
		if (mState != StatusBarState.KEYGUARD && mState != StatusBarState.SHADE_LOCKED) {
		if (mState != StatusBarState.KEYGUARD && mState != StatusBarState.SHADE_LOCKED
		&& !isBouncerOverDream) {
		if (mNotificationPanelViewController.canPanelBeCollapsed()) {
		mShadeController.animateCollapsePanels();
		}