Merge "[flexiglass] Improved structured concurrency in SceneContainer." into main (83f5e4f2) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.ui.composable.ComposableScene
		import javax.inject.Inject
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.Flow

		object Bouncer {
		object Elements {
		@@ -56,7 +56,7 @@ constructor(
		) : ComposableScene {
		override val key = Scenes.Bouncer

		override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> =
		override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =
		viewModel.destinationScenes

		@Composable

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,8 +30,8 @@ import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.ui.composable.ComposableScene
		import com.android.systemui.statusbar.phone.SystemUIDialogFactory
		import javax.inject.Inject
		import kotlinx.coroutines.flow.Flow
		import kotlinx.coroutines.flow.MutableStateFlow
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.asStateFlow

		/** The communal scene shows glanceable hub when the device is locked and docked. */
		@@ -45,7 +45,7 @@ constructor(
		) : ComposableScene {
		override val key = Scenes.Communal

		override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> =
		override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =
		MutableStateFlow<Map<UserAction, UserActionResult>>(
		mapOf(
		Swipe(SwipeDirection.Right) to UserActionResult(Scenes.Lockscreen),

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockscreenScene.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.ui.composable.ComposableScene
		import dagger.Lazy
		import javax.inject.Inject
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.Flow

		/** The lock screen scene shows when the device is locked. */
		@SysUISingleton
		@@ -42,7 +42,7 @@ constructor(
		) : ComposableScene {
		override val key = Scenes.Lockscreen

		override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> =
		override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =
		viewModel.destinationScenes

		@Composable

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ import com.android.systemui.statusbar.phone.ui.TintedIconManager
		import dagger.Lazy
		import java.util.Optional
		import javax.inject.Inject
		import kotlinx.coroutines.flow.StateFlow
		import kotlinx.coroutines.flow.Flow

		@SysUISingleton
		class NotificationsShadeScene
		@@ -64,7 +64,7 @@ constructor(

		override val key = Scenes.NotificationsShade

		override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> =
		override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =
		sceneViewModel.destinationScenes

		@Composable

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

+5 −11

Original line number	Diff line number	Diff line
		@@ -69,6 +69,8 @@ import androidx.compose.ui.unit.dp
		import androidx.lifecycle.compose.collectAsStateWithLifecycle
		import com.android.compose.animation.scene.SceneScope
		import com.android.compose.animation.scene.TransitionState
		import com.android.compose.animation.scene.UserAction
		import com.android.compose.animation.scene.UserActionResult
		import com.android.compose.animation.scene.animateSceneDpAsState
		import com.android.compose.animation.scene.animateSceneFloatAsState
		import com.android.compose.modifiers.thenIf
		@@ -79,7 +81,6 @@ import com.android.systemui.common.ui.compose.windowinsets.LocalDisplayCutout
		import com.android.systemui.common.ui.compose.windowinsets.LocalRawScreenHeight
		import com.android.systemui.compose.modifiers.sysuiResTag
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.media.controls.ui.composable.MediaCarousel
		import com.android.systemui.media.controls.ui.controller.MediaCarouselController
		import com.android.systemui.media.controls.ui.view.MediaHost
		@@ -109,16 +110,13 @@ import dagger.Lazy
		import javax.inject.Inject
		import javax.inject.Named
		import kotlin.math.roundToInt
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.flow.SharingStarted
		import kotlinx.coroutines.flow.stateIn
		import kotlinx.coroutines.flow.Flow

		/** The Quick Settings (AKA "QS") scene shows the quick setting tiles. */
		@SysUISingleton
		class QuickSettingsScene
		@Inject
		constructor(
		@Application private val applicationScope: CoroutineScope,
		private val shadeSession: SaveableSession,
		private val notificationStackScrollView: Lazy<NotificationScrollView>,
		private val viewModel: QuickSettingsSceneViewModel,
		@@ -131,12 +129,8 @@ constructor(
		) : ComposableScene {
		override val key = Scenes.QuickSettings

		override val destinationScenes =
		viewModel.destinationScenes.stateIn(
		scope = applicationScope,
		started = SharingStarted.WhileSubscribed(),
		initialValue = emptyMap(),
		)
		override val destinationScenes: Flow<Map<UserAction, UserActionResult>> =
		viewModel.destinationScenes

		@Composable
		override fun SceneScope.Content(