Merge "Do not animate scrims when launching camera" into pi-dev am: aa21ec053c

am: 273bce2fde

Change-Id: I2e18284b89f8ba3ac7aca0095392550f345a7839

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

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

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index d8e3dd8,9f24085..6ce631f
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@@ -4748,16 -4734,23 +4748,21 @@@ public class StatusBar extends SystemU
  
          // Do not animate the scrim expansion when triggered by the fingerprint sensor.
          mScrimController.setExpansionAffectsAlpha(
 -                !mFingerprintUnlockController.isFingerprintUnlock());
 +                !mBiometricUnlockController.isBiometricUnlock());
  
+         boolean launchingAffordanceWithPreview =
+                 mNotificationPanel.isLaunchingAffordanceWithPreview();
+         mScrimController.setLaunchingAffordanceWithPreview(launchingAffordanceWithPreview);
+ 
          if (mBouncerShowing) {
              // Bouncer needs the front scrim when it's on top of an activity,
              // tapping on a notification, editing QS or being dismissed by
              // FLAG_DISMISS_KEYGUARD_ACTIVITY.
 -            ScrimState state = mIsOccluded || mStatusBarKeyguardViewManager.bouncerNeedsScrimming()
 -                    || mStatusBarKeyguardViewManager.willDismissWithAction()
 -                    || mStatusBarKeyguardViewManager.isFullscreenBouncer() ?
 -                    ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;
 +            ScrimState state = mStatusBarKeyguardViewManager.bouncerNeedsScrimming()
 +                    ? ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;
              mScrimController.transitionTo(state);
-         } else if (mLaunchCameraOnScreenTurningOn || isInLaunchTransition()) {
+         } else if (isInLaunchTransition() || mLaunchCameraOnScreenTurningOn
+                 || launchingAffordanceWithPreview) {
              mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);
          } else if (mBrightnessMirrorVisible) {
              mScrimController.transitionTo(ScrimState.BRIGHTNESS_MIRROR);