Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show scrims when bouncer is on top of QS" into pi-dev

Browse Source
This commit is contained in:
Lucas Dupin
2018-03-13 18:26:07 +00:00
committed by Android (Google) Code Review
parent bf4f1795ec ae861e8ee0
commit fa9eef6459
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4624,8 +4624,9 @@ public class StatusBar extends SystemUI implements DemoMode,
!= FingerprintUnlockController.MODE_UNLOCK); != FingerprintUnlockController.MODE_UNLOCK);
if (mBouncerShowing) { if (mBouncerShowing) {
mScrimController.transitionTo( final boolean qsExpanded = mQSPanel != null && mQSPanel.isExpanded();
mIsOccluded ? ScrimState.BOUNCER_OCCLUDED : ScrimState.BOUNCER); mScrimController.transitionTo(mIsOccluded || qsExpanded ?
ScrimState.BOUNCER_OCCLUDED : ScrimState.BOUNCER);
} else if (mLaunchCameraOnScreenTurningOn || isInLaunchTransition()) { } else if (mLaunchCameraOnScreenTurningOn || isInLaunchTransition()) {
mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback); mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);
} else if (mBrightnessMirrorVisible) { } else if (mBrightnessMirrorVisible) {