Merge "Replace slide transitions with fade for flexiglass" into main (ecdc386c) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/scene/ui/composable/transitions/FromDreamToCommunalTransition.kt

+2 −7

Original line number	Diff line number	Diff line
		@@ -17,17 +17,12 @@
		package com.android.systemui.scene.ui.composable.transitions

		import androidx.compose.animation.core.tween
		import com.android.compose.animation.scene.Edge
		import com.android.compose.animation.scene.TransitionBuilder
		import com.android.systemui.communal.ui.compose.AllElements
		import com.android.systemui.communal.ui.compose.Communal

		fun TransitionBuilder.dreamToCommunalTransition() {
		spec = tween(durationMillis = 1000)

		// Translate communal hub grid from the end direction.
		translate(Communal.Elements.Grid, Edge.End)

		// Fade all communal hub elements.
		timestampRange(startMillis = 167, endMillis = 334) { fade(AllElements) }
		// Fade in all communal hub elements.
		fade(AllElements)
		}

+2 −11

Original line number	Diff line number	Diff line
		@@ -17,21 +17,12 @@
		package com.android.systemui.scene.ui.composable.transitions

		import androidx.compose.animation.core.tween
		import com.android.compose.animation.scene.Edge
		import com.android.compose.animation.scene.TransitionBuilder
		import com.android.systemui.communal.ui.compose.AllElements
		import com.android.systemui.communal.ui.compose.Communal
		import com.android.systemui.scene.shared.model.Scenes

		fun TransitionBuilder.lockscreenToCommunalTransition() {
		spec = tween(durationMillis = 1000)

		// Translate lockscreen to the start direction.
		translate(Scenes.Lockscreen.rootElementKey, Edge.Start)

		// Translate communal hub grid from the end direction.
		translate(Communal.Elements.Grid, Edge.End)

		// Fade all communal hub elements.
		timestampRange(startMillis = 167, endMillis = 334) { fade(AllElements) }
		// Fade all communal hub elements in.
		fade(AllElements)
		}