Merge "Use AUTH_SCRIMMED_SHADE if transitioning to shade" (c5bdecc1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ class LockscreenShadeTransitionController @Inject constructor(
		wakefulnessLifecycle: WakefulnessLifecycle,
		configurationController: ConfigurationController,
		falsingManager: FalsingManager,
		dumpManager: DumpManager,
		dumpManager: DumpManager
		) : Dumpable {
		private var pulseHeight: Float = 0f
		private var useSplitShade: Boolean = false
		@@ -363,6 +363,7 @@ class LockscreenShadeTransitionController @Inject constructor(
		notificationPanelController.setKeyguardOnlyContentAlpha(1.0f - scrimProgress)
		depthController.transitionToFullShadeProgress = scrimProgress
		udfpsKeyguardViewController?.setTransitionToFullShadeProgress(scrimProgress)
		statusbar.setTransitionToFullShadeProgress(scrimProgress)
		}

		private fun setDragDownAmountAnimated(

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

+12 −1

Original line number	Diff line number	Diff line
		@@ -344,6 +344,7 @@ public class StatusBar extends CoreStartable implements
		private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;
		private final DreamOverlayStateController mDreamOverlayStateController;
		private StatusBarCommandQueueCallbacks mCommandQueueCallbacks;
		private float mTransitionToFullShadeProgress = 0f;

		void onStatusBarWindowStateChanged(@WindowVisibleState int state) {
		updateBubblesVisibility();
		@@ -3777,6 +3778,15 @@ public class StatusBar extends CoreStartable implements
		updateScrimController();
		}

		/**
		* Set the amount of progress we are currently in if we're transitioning to the full shade.
		* 0.0f means we're not transitioning yet, while 1 means we're all the way in the full
		* shade.
		*/
		public void setTransitionToFullShadeProgress(float transitionToFullShadeProgress) {
		mTransitionToFullShadeProgress = transitionToFullShadeProgress;
		}

		@VisibleForTesting
		public void updateScrimController() {
		Trace.beginSection("StatusBar#updateScrimController");
		@@ -3795,7 +3805,8 @@ public class StatusBar extends CoreStartable implements
		mScrimController.setLaunchingAffordanceWithPreview(launchingAffordanceWithPreview);

		if (mStatusBarKeyguardViewManager.isShowingAlternateAuth()) {
		if (mState == StatusBarState.SHADE \|\| mState == StatusBarState.SHADE_LOCKED) {
		if (mState == StatusBarState.SHADE \|\| mState == StatusBarState.SHADE_LOCKED
		\|\| mTransitionToFullShadeProgress > 0f) {
		mScrimController.transitionTo(ScrimState.AUTH_SCRIMMED_SHADE);
		} else {
		mScrimController.transitionTo(ScrimState.AUTH_SCRIMMED);