commit fa9eef645979730d9699a56961ab5c918f4ad896
author Lucas Dupin <dupin@google.com> Tue Mar 13 18:26:07 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 13 18:26:07 2018 +0000
tree 7b3812f63ca9d214d999f643aa8b04c416fc6a92
parent bf4f1795ece906ca7691cbddfed169cf73f3462b
parent ae861e8ee00a70e685faefe33098e6dccd30a23a

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

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

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 5c77524..e4f142a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -4624,8 +4624,9 @@
                 != FingerprintUnlockController.MODE_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) {