Merge "Fix Media Carousel gone <-> splitshade transition" into main (40477f9b) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ import androidx.compose.ui.unit.IntSize
		import com.android.compose.animation.scene.TransitionBuilder
		import com.android.compose.animation.scene.UserActionDistance
		import com.android.compose.animation.scene.UserActionDistanceScope
		import com.android.systemui.media.controls.ui.composable.MediaCarousel
		import com.android.systemui.media.controls.ui.composable.MediaScenePicker
		import com.android.systemui.notifications.ui.composable.Notifications
		import com.android.systemui.qs.ui.composable.QuickSettings
		import com.android.systemui.shade.ui.composable.Shade
		@@ -52,6 +54,12 @@ fun TransitionBuilder.goneToSplitShadeTransition(
		fractionRange(end = .33f) { fade(Shade.Elements.BackgroundScrim) }

		fractionRange(start = .33f) {
		val qsTranslation = ShadeHeader.Dimensions.CollapsedHeight * MediaScenePicker.SHADE_FRACTION
		val qsExpansionDiff =
		ShadeHeader.Dimensions.ExpandedHeight - ShadeHeader.Dimensions.CollapsedHeight
		translate(MediaCarousel.Elements.Content, y = -(qsExpansionDiff + qsTranslation))
		fade(MediaCarousel.Elements.Content)

		fade(ShadeHeader.Elements.Clock)
		fade(ShadeHeader.Elements.CollapsedContentStart)
		fade(ShadeHeader.Elements.CollapsedContentEnd)