Merge "Simplify scrimmed bouncer condition" (1a64e1a1) · Commits · e / os / android_frameworks_base

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -4754,10 +4754,8 @@ public class StatusBar extends SystemUI implements DemoMode,
		// Bouncer needs the front scrim when it's on top of an activity,
		// tapping on a notification, editing QS or being dismissed by
		// FLAG_DISMISS_KEYGUARD_ACTIVITY.
		ScrimState state = mIsOccluded \|\| mStatusBarKeyguardViewManager.bouncerNeedsScrimming()
		\|\| mStatusBarKeyguardViewManager.willDismissWithAction()
		\|\| mStatusBarKeyguardViewManager.isFullscreenBouncer() ?
		ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;
		ScrimState state = mStatusBarKeyguardViewManager.bouncerNeedsScrimming()
		? ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;
		mScrimController.transitionTo(state);
		} else if (mLaunchCameraOnScreenTurningOn \|\| isInLaunchTransition()) {
		mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);

+3 −7

Original line number	Diff line number	Diff line
		@@ -170,8 +170,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		// • Full-screen user switcher is displayed.
		if (mNotificationPanelView.isUnlockHintRunning()) {
		mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);
		} else if (mOccluded \|\| mBouncer.willDismissWithAction() \|\| mBouncer.isShowingScrimmed()
		\|\| mStatusBar.isFullScreenUserSwitcherState()) {
		} else if (bouncerNeedsScrimming()) {
		mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);
		} else if (mShowing && !mDozing) {
		if (!isWakeAndUnlocking() && !mStatusBar.isInLaunchTransition()) {
		@@ -731,12 +730,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		}
		}

		public boolean willDismissWithAction() {
		return mBouncer.willDismissWithAction();
		}

		public boolean bouncerNeedsScrimming() {
		return mBouncer.isShowingScrimmed();
		return mOccluded \|\| mBouncer.willDismissWithAction() \|\| mBouncer.needsFullscreenBouncer()
		\|\| mStatusBar.isFullScreenUserSwitcherState() \|\| mBouncer.isShowingScrimmed();
		}

		public void dump(PrintWriter pw) {