Merge "Enable swipe to dismiss gesture on glanceable hub." into main (4a26f673) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt

+1 −6

Original line number	Diff line number	Diff line
		@@ -207,12 +207,7 @@ fun CommunalContainer(
		Box(modifier = Modifier.fillMaxSize())
		}

		scene(
		CommunalScenes.Communal,
		userActions =
		if (viewModel.v2FlagEnabled()) emptyMap()
		else mapOf(Swipe.End to CommunalScenes.Blank),
		) {
		scene(CommunalScenes.Communal, userActions = mapOf(Swipe.End to CommunalScenes.Blank)) {
		CommunalScene(
		backgroundType = backgroundType,
		colors = colors,

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ constructor(
		* Note that [onCancel] isn't used when the scene framework is enabled.
		*/
		fun sharedFlow(
		duration: Duration,
		duration: Duration = transitionDuration,
		onStep: (Float) -> Float,
		startTime: Duration = 0.milliseconds,
		onStart: (() -> Unit)? = null,

+13 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.keyguard.ui.transitions

		import android.util.MathUtils
		import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow
		import javax.inject.Inject
		import kotlinx.coroutines.flow.Flow
		@@ -33,8 +34,18 @@ constructor(
		blurConfig: BlurConfig,
		) {
		val exitBlurRadius: Flow<Float> =
		transitionAnimation.immediatelyTransitionTo(blurConfig.minBlurRadiusPx)
		transitionAnimation.sharedFlow(
		onStep = { MathUtils.lerp(blurConfig.maxBlurRadiusPx, blurConfig.minBlurRadiusPx, it) },
		onStart = { blurConfig.maxBlurRadiusPx },
		onFinish = { blurConfig.minBlurRadiusPx },
		onCancel = { blurConfig.maxBlurRadiusPx },
		)

		val enterBlurRadius: Flow<Float> =
		transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx)
		transitionAnimation.sharedFlow(
		onStep = { MathUtils.lerp(blurConfig.minBlurRadiusPx, blurConfig.maxBlurRadiusPx, it) },
		onStart = { blurConfig.minBlurRadiusPx },
		onFinish = { blurConfig.maxBlurRadiusPx },
		onCancel = { blurConfig.minBlurRadiusPx },
		)
		}