Merge "[flexiglass] Allow dual notification shade to align to the bottom." into main (98264c6c) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/NotificationsShadeScene.kt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.Column
	import androidx.compose.foundation.layout.fillMaxWidth		import androidx.compose.foundation.layout.fillMaxWidth
	import androidx.compose.foundation.layout.padding		import androidx.compose.foundation.layout.padding
	import androidx.compose.runtime.Composable		import androidx.compose.runtime.Composable
	import androidx.compose.ui.Alignment
	import androidx.compose.ui.Modifier		import androidx.compose.ui.Modifier
	import androidx.compose.ui.unit.dp		import androidx.compose.ui.unit.dp
	import com.android.compose.animation.scene.SceneScope		import com.android.compose.animation.scene.SceneScope
	@@ -75,7 +74,6 @@ constructor(
	OverlayShade(		OverlayShade(
	modifier = modifier,		modifier = modifier,
	viewModel = overlayShadeViewModel,		viewModel = overlayShadeViewModel,
	panelAlignment = Alignment.TopEnd,
	lockscreenContent = lockscreenContent,		lockscreenContent = lockscreenContent,
	) {		) {
	Column {		Column {

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsShadeScene.kt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,6 @@ constructor(
	) {		) {
	OverlayShade(		OverlayShade(
	viewModel = viewModel.overlayShadeViewModel,		viewModel = viewModel.overlayShadeViewModel,
	panelAlignment = Alignment.TopEnd,
	lockscreenContent = lockscreenContent,		lockscreenContent = lockscreenContent,
	modifier = modifier,		modifier = modifier,
	) {		) {

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

+8 −1

Original line number	Original line	Diff line number	Diff line
	package com.android.systemui.scene.ui.composable		package com.android.systemui.scene.ui.composable

	import androidx.compose.foundation.gestures.Orientation		import androidx.compose.foundation.gestures.Orientation
			import com.android.compose.animation.scene.Edge
	import com.android.compose.animation.scene.transitions		import com.android.compose.animation.scene.transitions
	import com.android.systemui.bouncer.ui.composable.Bouncer		import com.android.systemui.bouncer.ui.composable.Bouncer
	import com.android.systemui.notifications.ui.composable.Notifications		import com.android.systemui.notifications.ui.composable.Notifications
	import com.android.systemui.scene.shared.model.Scenes		import com.android.systemui.scene.shared.model.Scenes
			import com.android.systemui.scene.shared.model.TransitionKeys.OpenBottomShade
	import com.android.systemui.scene.shared.model.TransitionKeys.SlightlyFasterShadeCollapse		import com.android.systemui.scene.shared.model.TransitionKeys.SlightlyFasterShadeCollapse
	import com.android.systemui.scene.shared.model.TransitionKeys.ToSplitShade		import com.android.systemui.scene.shared.model.TransitionKeys.ToSplitShade
	import com.android.systemui.scene.ui.composable.transitions.bouncerToGoneTransition		import com.android.systemui.scene.ui.composable.transitions.bouncerToGoneTransition
	@@ -42,7 +44,12 @@ val SceneContainerTransitions = transitions {
	// Scene transitions		// Scene transitions

	from(Scenes.Bouncer, to = Scenes.Gone) { bouncerToGoneTransition() }		from(Scenes.Bouncer, to = Scenes.Gone) { bouncerToGoneTransition() }
	from(Scenes.Gone, to = Scenes.NotificationsShade) { goneToNotificationsShadeTransition() }		from(Scenes.Gone, to = Scenes.NotificationsShade) {
			goneToNotificationsShadeTransition(Edge.Top)
			}
			from(Scenes.Gone, to = Scenes.NotificationsShade, key = OpenBottomShade) {
			goneToNotificationsShadeTransition(Edge.Bottom)
			}
	from(Scenes.Gone, to = Scenes.Shade) { goneToShadeTransition() }		from(Scenes.Gone, to = Scenes.Shade) { goneToShadeTransition() }
	from(		from(
	Scenes.Gone,		Scenes.Gone,

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,10 +16,12 @@

	package com.android.systemui.scene.ui.composable.transitions		package com.android.systemui.scene.ui.composable.transitions

			import com.android.compose.animation.scene.Edge
	import com.android.compose.animation.scene.TransitionBuilder		import com.android.compose.animation.scene.TransitionBuilder

	fun TransitionBuilder.goneToNotificationsShadeTransition(		fun TransitionBuilder.goneToNotificationsShadeTransition(
			edge: Edge = Edge.Top,
	durationScale: Double = 1.0,		durationScale: Double = 1.0,
	) {		) {
	toNotificationsShadeTransition(durationScale)		toNotificationsShadeTransition(edge, durationScale)
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,5 +21,5 @@ import com.android.compose.animation.scene.TransitionBuilder
	fun TransitionBuilder.lockscreenToNotificationsShadeTransition(		fun TransitionBuilder.lockscreenToNotificationsShadeTransition(
	durationScale: Double = 1.0,		durationScale: Double = 1.0,
	) {		) {
	toNotificationsShadeTransition(durationScale)		toNotificationsShadeTransition(durationScale = durationScale)
	}		}