Merge "Introduce DreamScene" into main (741bcd09) · Commits · e / os / android_frameworks_base

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

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.scene

		import com.android.systemui.dream.ui.composable.DreamScene
		import com.android.systemui.scene.ui.composable.Scene
		import dagger.Binds
		import dagger.Module
		import dagger.multibindings.IntoSet

		@Module
		interface DreamSceneModule {
		@Binds @IntoSet fun dreamScene(scene: DreamScene): Scene
		}

packages/SystemUI/compose/features/src/com/android/systemui/dream/ui/composable/DreamScene.kt

0 → 100644

+66 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.dream.ui.composable

		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.fillMaxSize
		import androidx.compose.foundation.layout.padding
		import androidx.compose.material3.Text
		import androidx.compose.runtime.Composable
		import androidx.compose.ui.Alignment
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.unit.dp
		import com.android.compose.animation.scene.SceneScope
		import com.android.compose.animation.scene.UserAction
		import com.android.compose.animation.scene.UserActionResult
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dreams.ui.viewmodel.DreamUserActionsViewModel
		import com.android.systemui.lifecycle.ExclusiveActivatable
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.ui.composable.Scene
		import javax.inject.Inject
		import kotlinx.coroutines.flow.Flow

		/** The dream scene shows when a dream activity is showing. */
		@SysUISingleton
		class DreamScene
		@Inject
		constructor(private val actionsViewModelFactory: DreamUserActionsViewModel.Factory) :
		ExclusiveActivatable(), Scene {
		override val key = Scenes.Dream

		private val actionsViewModel: DreamUserActionsViewModel by lazy {
		actionsViewModelFactory.create()
		}

		override val userActions: Flow<Map<UserAction, UserActionResult>> = actionsViewModel.actions

		override suspend fun onActivated(): Nothing {
		actionsViewModel.activate()
		}

		@Composable
		override fun SceneScope.Content(modifier: Modifier) {
		Box(modifier = modifier.fillMaxSize()) {
		// Render a sleep emoji to make the scene appear visible.
		Text(
		modifier = Modifier.padding(16.dp).align(Alignment.BottomStart),
		text = "\uD83D\uDCA4",
		)
		}
		}
		}

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -15,11 +15,13 @@ import com.android.systemui.scene.ui.composable.transitions.bouncerToGoneTransit
		import com.android.systemui.scene.ui.composable.transitions.bouncerToLockscreenPreview
		import com.android.systemui.scene.ui.composable.transitions.communalToBouncerTransition
		import com.android.systemui.scene.ui.composable.transitions.communalToShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.dreamToGoneTransition
		import com.android.systemui.scene.ui.composable.transitions.goneToQuickSettingsTransition
		import com.android.systemui.scene.ui.composable.transitions.goneToShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.goneToSplitShadeTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToBouncerTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToCommunalTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToDreamTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToGoneTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToQuickSettingsTransition
		import com.android.systemui.scene.ui.composable.transitions.lockscreenToShadeTransition
		@@ -52,6 +54,7 @@ val SceneContainerTransitions = transitions {
		// Scene transitions

		from(Scenes.Bouncer, to = Scenes.Gone) { bouncerToGoneTransition() }
		from(Scenes.Dream, to = Scenes.Gone) { dreamToGoneTransition() }
		from(Scenes.Gone, to = Scenes.Shade) { goneToShadeTransition() }
		from(Scenes.Gone, to = Scenes.Shade, key = ToSplitShade) { goneToSplitShadeTransition() }
		from(Scenes.Gone, to = Scenes.Shade, key = SlightlyFasterShadeCollapse) {
		@@ -72,6 +75,7 @@ val SceneContainerTransitions = transitions {
		lockscreenToBouncerTransition()
		}
		from(Scenes.Lockscreen, to = Scenes.Communal) { lockscreenToCommunalTransition() }
		from(Scenes.Lockscreen, to = Scenes.Dream) { lockscreenToDreamTransition() }
		from(Scenes.Lockscreen, to = Scenes.Shade) { lockscreenToShadeTransition() }
		from(Scenes.Lockscreen, to = Scenes.Shade, key = ToSplitShade) {
		lockscreenToSplitShadeTransition()

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

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

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

		import androidx.compose.animation.core.tween
		import com.android.compose.animation.scene.TransitionBuilder
		import com.android.systemui.scene.shared.model.Scenes

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

		fade(Scenes.Dream.rootElementKey)
		}

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

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

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

		import androidx.compose.animation.core.tween
		import com.android.compose.animation.scene.TransitionBuilder
		import com.android.systemui.scene.shared.model.Scenes

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

		fade(Scenes.Lockscreen.rootElementKey)
		}