Merge "[flexiglass] Adds TransitionKey support." into main (e164d252) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/facade/disabled/src/com/android/systemui/compose/ComposeFacade.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ object ComposeFacade : BaseComposeFacade {
		viewModel: SceneContainerViewModel,
		windowInsets: StateFlow<WindowInsets?>,
		sceneByKey: Map<SceneKey, Scene>,
		dataSourceDelegator: SceneDataSourceBinder,
		): View {
		throwComposeUnavailableError()
		}

packages/SystemUI/compose/facade/enabled/src/com/android/systemui/compose/ComposeFacade.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import com.android.systemui.people.ui.viewmodel.PeopleViewModel
		import com.android.systemui.qs.footer.ui.compose.FooterActions
		import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel
		import com.android.systemui.scene.shared.model.Scene
		import com.android.systemui.scene.shared.model.SceneDataSourceDelegator
		import com.android.systemui.scene.shared.model.SceneKey
		import com.android.systemui.scene.ui.composable.ComposableScene
		import com.android.systemui.scene.ui.composable.SceneContainer
		@@ -127,6 +128,7 @@ object ComposeFacade : BaseComposeFacade {
		viewModel: SceneContainerViewModel,
		windowInsets: StateFlow<WindowInsets?>,
		sceneByKey: Map<SceneKey, Scene>,
		dataSourceDelegator: SceneDataSourceDelegator,
		): View {
		return ComposeView(context).apply {
		setContent {
		@@ -139,6 +141,7 @@ object ComposeFacade : BaseComposeFacade {
		viewModel = viewModel,
		sceneByKey =
		sceneByKey.mapValues { (_, scene) -> scene as ComposableScene },
		dataSourceDelegator = dataSourceDelegator,
		)
		}
		}

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -29,8 +29,8 @@ import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.scene.shared.model.Direction
		import com.android.systemui.scene.shared.model.SceneKey
		import com.android.systemui.scene.shared.model.SceneModel
		import com.android.systemui.scene.shared.model.UserAction
		import com.android.systemui.scene.shared.model.UserActionResult
		import com.android.systemui.scene.ui.composable.ComposableScene
		import javax.inject.Inject
		import kotlinx.coroutines.flow.MutableStateFlow
		@@ -54,11 +54,11 @@ constructor(
		) : ComposableScene {
		override val key = SceneKey.Bouncer

		override val destinationScenes: StateFlow<Map<UserAction, SceneModel>> =
		override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> =
		MutableStateFlow(
		mapOf(
		UserAction.Back to SceneModel(SceneKey.Lockscreen),
		UserAction.Swipe(Direction.DOWN) to SceneModel(SceneKey.Lockscreen),
		UserAction.Back to UserActionResult(SceneKey.Lockscreen),
		UserAction.Swipe(Direction.DOWN) to UserActionResult(SceneKey.Lockscreen),
		)
		)
		.asStateFlow()

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -23,8 +23,8 @@ import com.android.systemui.communal.ui.viewmodel.CommunalViewModel
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.scene.shared.model.Direction
		import com.android.systemui.scene.shared.model.SceneKey
		import com.android.systemui.scene.shared.model.SceneModel
		import com.android.systemui.scene.shared.model.UserAction
		import com.android.systemui.scene.shared.model.UserActionResult
		import com.android.systemui.scene.ui.composable.ComposableScene
		import javax.inject.Inject
		import kotlinx.coroutines.flow.MutableStateFlow
		@@ -40,10 +40,10 @@ constructor(
		) : ComposableScene {
		override val key = SceneKey.Communal

		override val destinationScenes: StateFlow<Map<UserAction, SceneModel>> =
		MutableStateFlow<Map<UserAction, SceneModel>>(
		override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> =
		MutableStateFlow<Map<UserAction, UserActionResult>>(
		mapOf(
		UserAction.Swipe(Direction.RIGHT) to SceneModel(SceneKey.Lockscreen),
		UserAction.Swipe(Direction.RIGHT) to UserActionResult(SceneKey.Lockscreen),
		)
		)
		.asStateFlow()

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ import com.android.systemui.keyguard.ui.viewmodel.LockscreenSceneViewModel
		import com.android.systemui.scene.shared.model.Direction
		import com.android.systemui.scene.shared.model.Edge
		import com.android.systemui.scene.shared.model.SceneKey
		import com.android.systemui.scene.shared.model.SceneModel
		import com.android.systemui.scene.shared.model.UserAction
		import com.android.systemui.scene.shared.model.UserActionResult
		import com.android.systemui.scene.ui.composable.ComposableScene
		import dagger.Lazy
		import javax.inject.Inject
		@@ -49,7 +49,7 @@ constructor(
		) : ComposableScene {
		override val key = SceneKey.Lockscreen

		override val destinationScenes: StateFlow<Map<UserAction, SceneModel>> =
		override val destinationScenes: StateFlow<Map<UserAction, UserActionResult>> =
		combine(viewModel.upDestinationSceneKey, viewModel.leftDestinationSceneKey, ::Pair)
		.map { (upKey, leftKey) -> destinationScenes(up = upKey, left = leftKey) }
		.stateIn(
		@@ -75,13 +75,13 @@ constructor(
		private fun destinationScenes(
		up: SceneKey?,
		left: SceneKey?,
		): Map<UserAction, SceneModel> {
		): Map<UserAction, UserActionResult> {
		return buildMap {
		up?.let { this[UserAction.Swipe(Direction.UP)] = SceneModel(up) }
		left?.let { this[UserAction.Swipe(Direction.LEFT)] = SceneModel(left) }
		up?.let { this[UserAction.Swipe(Direction.UP)] = UserActionResult(up) }
		left?.let { this[UserAction.Swipe(Direction.LEFT)] = UserActionResult(left) }
		this[UserAction.Swipe(fromEdge = Edge.TOP, direction = Direction.DOWN)] =
		SceneModel(SceneKey.QuickSettings)
		this[UserAction.Swipe(direction = Direction.DOWN)] = SceneModel(SceneKey.Shade)
		UserActionResult(SceneKey.QuickSettings)
		this[UserAction.Swipe(direction = Direction.DOWN)] = UserActionResult(SceneKey.Shade)
		}
		}
		}