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

Show scrims when bouncer is on top of QS

Browse Source 
Test: visual
Change-Id: I09c37c8478e1c409854af837cabf7bb12c5de79b
Fixes: 74511816
This commit is contained in:
Lucas Dupin
2018-03-12 11:39:29 -07:00
parent 6964e7548f
commit ae861e8ee0
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

@@ -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) {