diff options
| author | 2018-03-12 11:39:29 -0700 | |
|---|---|---|
| committer | 2018-03-13 00:14:34 -0700 | |
| commit | ae861e8ee00a70e685faefe33098e6dccd30a23a (patch) | |
| tree | eae918f33aeb891e7af4d4d62deecb4e435f40c3 | |
| parent | 6964e7548f37b64187ed0ba32805285d8c57f520 (diff) | |
Show scrims when bouncer is on top of QS
Test: visual
Change-Id: I09c37c8478e1c409854af837cabf7bb12c5de79b
Fixes: 74511816
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index a305bfc7b0ab..1219ada78b99 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -4619,8 +4619,9 @@ public class StatusBar extends SystemUI implements DemoMode, == FingerprintUnlockController.MODE_WAKE_AND_UNLOCK; if (mBouncerShowing) { - mScrimController.transitionTo( - mIsOccluded ? ScrimState.BOUNCER_OCCLUDED : ScrimState.BOUNCER); + final boolean qsExpanded = mQSPanel != null && mQSPanel.isExpanded(); + mScrimController.transitionTo(mIsOccluded || qsExpanded ? + ScrimState.BOUNCER_OCCLUDED : ScrimState.BOUNCER); } else if (mLaunchCameraOnScreenTurningOn || isInLaunchTransition()) { mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback); } else if (mBrightnessMirrorVisible) { |