Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f20f587 authored May 07, 2024 by Danny Burakov Committed by Android (Google) Code Review May 07, 2024

Merge "[bc25] Move the `NotificationsShade` scene to the notifications package." into main

parents c79021d1 5f3d7044

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,10 +26,10 @@ 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.notifications.ui.viewmodel.NotificationsShadeSceneViewModel
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.ui.composable.ComposableScene
		import com.android.systemui.shade.ui.composable.OverlayShade
		import com.android.systemui.shade.ui.viewmodel.NotificationsShadeSceneViewModel
		import com.android.systemui.shade.ui.viewmodel.OverlayShadeViewModel
		import javax.inject.Inject
		import kotlinx.coroutines.flow.StateFlow

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/NotificationsShadeSceneViewModelTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeSceneViewModelTest.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.systemui.shade.ui.viewmodel
		package com.android.systemui.notifications.ui.viewmodel

		import android.testing.TestableLooper
		import androidx.test.ext.junit.runners.AndroidJUnit4
		@@ -32,6 +32,7 @@ import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticati
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.scene.domain.interactor.sceneInteractor
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.shade.ui.viewmodel.notificationsShadeSceneViewModel
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.ExperimentalCoroutinesApi

packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/NotificationsShadeSceneViewModel.kt→packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeSceneViewModel.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.systemui.shade.ui.viewmodel
		package com.android.systemui.notifications.ui.viewmodel

		import com.android.compose.animation.scene.Back
		import com.android.compose.animation.scene.SceneKey
		@@ -23,6 +23,7 @@ import com.android.compose.animation.scene.UserAction
		import com.android.compose.animation.scene.UserActionResult
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.shade.ui.viewmodel.OverlayShadeViewModel
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineScope
		import kotlinx.coroutines.flow.SharingStarted

packages/SystemUI/tests/utils/src/com/android/systemui/shade/ui/viewmodel/NotificationsShadeSceneViewModelKosmos.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.systemui.shade.ui.viewmodel

		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.applicationCoroutineScope
		import com.android.systemui.notifications.ui.viewmodel.NotificationsShadeSceneViewModel

		val Kosmos.notificationsShadeSceneViewModel: NotificationsShadeSceneViewModel by
		Kosmos.Fixture {