Merge "Revert "[Flexiglass] Wire in NSSL#setFractionToShade"" into main (3b168dee) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ import android.util.AttributeSet;
		import android.util.IndentingPrintWriter;
		import android.util.Log;
		import android.util.MathUtils;
		import android.util.Pair;
		import android.view.DisplayCutout;
		import android.view.InputDevice;
		import android.view.LayoutInflater;
		@@ -140,6 +141,7 @@ import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScr
		import com.android.systemui.statusbar.phone.HeadsUpAppearanceController;
		import com.android.systemui.statusbar.policy.ScrollAdapter;
		import com.android.systemui.statusbar.policy.SplitShadeStateController;
		import com.android.systemui.statusbar.ui.SystemBarUtilsProxy;
		import com.android.systemui.util.Assert;
		import com.android.systemui.util.ColorUtilKt;
		import com.android.systemui.util.DumpUtilsKt;
		@@ -6000,7 +6002,6 @@ public class NotificationStackScrollLayout
		* LockscreenShadeTransitionController resets fraction to 0
		* where it remains until the next lockscreen-to-shade transition.
		*/
		@Override
		public void setFractionToShade(float fraction) {
		mAmbientState.setFractionToShade(fraction);
		updateContentHeight(); // Recompute stack height with different section gap.

+0 −1

Original line number	Diff line number	Diff line
		@@ -1742,7 +1742,6 @@ public class NotificationStackScrollLayoutController implements Dumpable {
		* they remain until the next lockscreen-to-shade transition.
		*/
		public void setTransitionToFullShadeAmount(float fraction) {
		SceneContainerFlag.assertInLegacyMode();
		mView.setFractionToShade(fraction);
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -107,9 +107,6 @@ interface NotificationScrollView {
		/** sets the current expand fraction */
		fun setExpandFraction(expandFraction: Float)

		/** Sets the fraction of the LockScreen -> Shade transition. */
		fun setFractionToShade(fraction: Float)

		/** sets the current QS expand fraction */
		fun setQsExpandFraction(expandFraction: Float)

+0 −5

Original line number	Diff line number	Diff line
		@@ -95,11 +95,6 @@ constructor(
		view.setExpandFraction(it.coerceIn(0f, 1f))
		}
		}
		launch {
		viewModel.lockScreenToShadeTransitionProgress.collectTraced {
		view.setFractionToShade(it.coerceIn(0f, 1f))
		}
		}
		launch { viewModel.qsExpandFraction.collectTraced { view.setQsExpandFraction(it) } }
		launch { viewModel.blurRadius(maxBlurRadius).collect(view::setBlurRadius) }
		launch {

+0 −38

Original line number	Diff line number	Diff line
		@@ -207,44 +207,6 @@ constructor(
		val qsExpandFraction: Flow<Float> =
		shadeInteractor.qsExpansion.dumpWhileCollecting("qsExpandFraction")

		/**
		* Fraction of the LockScreen -> Shade transition. 0..1 while the transition in progress, and
		* snaps back to 0 when it is Idle.
		*/
		val lockScreenToShadeTransitionProgress: Flow<Float> =
		combine(
		shadeInteractor.shadeExpansion,
		shadeModeInteractor.shadeMode,
		sceneInteractor.transitionState,
		) { shadeExpansion, _, transitionState ->
		when (transitionState) {
		is Idle -> 0f
		is ChangeScene ->
		if (
		transitionState.isTransitioning(
		from = Scenes.Lockscreen,
		to = Scenes.Shade,
		)
		) {
		shadeExpansion
		} else {
		0f
		}

		is Transition.OverlayTransition ->
		if (
		transitionState.currentScene == Scenes.Lockscreen &&
		transitionState.isTransitioning(to = Overlays.NotificationsShade)
		) {
		shadeExpansion
		} else {
		0f
		}
		}
		}
		.distinctUntilChanged()
		.dumpWhileCollecting("lockScreenToShadeTransitionProgress")

		val isOccluded: Flow<Boolean> =
		bouncerInteractor.bouncerExpansion
		.map { it == 1f }