Merge "[flexiglass] StatusBarStateController uses scene framework." into main (198bad21) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,7 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() {
		SceneContainerViewModel(
		sceneInteractor = sceneInteractor,
		falsingInteractor = kosmos.falsingInteractor,
		powerInteractor = kosmos.powerInteractor,
		)
		.apply { setTransitionState(transitionState) }
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/interactor/SceneInteractorTest.kt

+0 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.power.data.repository.fakePowerRepository
		import com.android.systemui.scene.data.repository.sceneContainerRepository
		import com.android.systemui.scene.sceneContainerConfig
		import com.android.systemui.scene.sceneKeys
		@@ -276,12 +275,4 @@ class SceneInteractorTest : SysuiTestCase() {
		underTest.setVisible(true, "reason")
		assertThat(isVisible).isTrue()
		}

		@Test
		fun userInput() =
		testScope.runTest {
		assertThat(kosmos.fakePowerRepository.userTouchRegistered).isFalse()
		underTest.onUserInput()
		assertThat(kosmos.fakePowerRepository.userTouchRegistered).isTrue()
		}
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModelTest.kt

+12 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ import com.android.systemui.classifier.domain.interactor.falsingInteractor
		import com.android.systemui.classifier.fakeFalsingManager
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.power.data.repository.fakePowerRepository
		import com.android.systemui.power.domain.interactor.powerInteractor
		import com.android.systemui.scene.domain.interactor.sceneInteractor
		import com.android.systemui.scene.sceneContainerConfig
		import com.android.systemui.scene.sceneKeys
		@@ -32,6 +34,7 @@ import com.android.systemui.scene.shared.flag.fakeSceneContainerFlags
		import com.android.systemui.scene.shared.model.SceneKey
		import com.android.systemui.scene.shared.model.fakeSceneDataSource
		import com.android.systemui.testKosmos
		import com.android.systemui.util.mockito.mock
		import com.google.common.truth.Truth.assertThat
		import com.google.common.truth.Truth.assertWithMessage
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		@@ -61,6 +64,7 @@ class SceneContainerViewModelTest : SysuiTestCase() {
		SceneContainerViewModel(
		sceneInteractor = interactor,
		falsingInteractor = kosmos.falsingInteractor,
		powerInteractor = kosmos.powerInteractor,
		)
		}

		@@ -187,4 +191,12 @@ class SceneContainerViewModelTest : SysuiTestCase() {
		.isTrue()
		}
		}

		@Test
		fun userInput() =
		testScope.runTest {
		assertThat(kosmos.fakePowerRepository.userTouchRegistered).isFalse()
		underTest.onMotionEvent(mock())
		assertThat(kosmos.fakePowerRepository.userTouchRegistered).isTrue()
		}
		}

packages/SystemUI/src/com/android/systemui/scene/domain/interactor/SceneInteractor.kt

+0 −7

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.systemui.scene.domain.interactor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.deviceentry.domain.interactor.DeviceUnlockedInteractor
		import com.android.systemui.power.domain.interactor.PowerInteractor
		import com.android.systemui.scene.data.repository.SceneContainerRepository
		import com.android.systemui.scene.shared.logger.SceneLogger
		import com.android.systemui.scene.shared.model.ObservableTransitionState
		@@ -50,7 +49,6 @@ class SceneInteractor
		constructor(
		@Application private val applicationScope: CoroutineScope,
		private val repository: SceneContainerRepository,
		private val powerInteractor: PowerInteractor,
		private val logger: SceneLogger,
		private val deviceUnlockedInteractor: DeviceUnlockedInteractor,
		) {
		@@ -189,9 +187,4 @@ constructor(
		fun setTransitionState(transitionState: Flow<ObservableTransitionState>?) {
		repository.setTransitionState(transitionState)
		}

		/** Handles a user input event. */
		fun onUserInput() {
		powerInteractor.onUserTouch()
		}
		}

packages/SystemUI/src/com/android/systemui/scene/ui/viewmodel/SceneContainerViewModel.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.view.MotionEvent
		import com.android.systemui.classifier.Classifier
		import com.android.systemui.classifier.domain.interactor.FalsingInteractor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.power.domain.interactor.PowerInteractor
		import com.android.systemui.scene.domain.interactor.SceneInteractor
		import com.android.systemui.scene.shared.model.ObservableTransitionState
		import com.android.systemui.scene.shared.model.SceneKey
		@@ -34,6 +35,7 @@ class SceneContainerViewModel
		constructor(
		private val sceneInteractor: SceneInteractor,
		private val falsingInteractor: FalsingInteractor,
		private val powerInteractor: PowerInteractor,
		) {
		/**
		* Keys of all scenes in the container.
		@@ -64,7 +66,7 @@ constructor(
		* Call this before the [MotionEvent] starts to propagate through the UI hierarchy.
		*/
		fun onMotionEvent(event: MotionEvent) {
		sceneInteractor.onUserInput()
		powerInteractor.onUserTouch()
		falsingInteractor.onTouchEvent(event)
		}