Merge "Simplify scrimmed bouncer condition"

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index 914bba2,f971621..affc424
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@@ -170,11 -170,10 +170,10 @@@ public class StatusBarKeyguardViewManag
          // • 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()) {
 +            if (!isWakeAndUnlocking() && !mStatusBar.isInLaunchTransition()) {
                  mBouncer.setExpansion(expansion);
              }
              if (expansion != KeyguardBouncer.EXPANSION_HIDDEN && tracking