Merge "[flexiglass] Remove SceneLogger#logSceneChangeCommitted." into main (88290595) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ import com.android.systemui.qs.ui.adapter.fakeQSSceneAdapter
		import com.android.systemui.scene.domain.interactor.sceneInteractor
		import com.android.systemui.scene.domain.resolver.homeSceneFamilyResolver
		import com.android.systemui.scene.domain.startable.sceneContainerStartable
		import com.android.systemui.scene.shared.logger.sceneLogger
		import com.android.systemui.scene.shared.model.SceneFamilies
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.shared.model.fakeSceneDataSource
		@@ -133,6 +134,7 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() {
		sceneInteractor = sceneInteractor,
		falsingInteractor = kosmos.falsingInteractor,
		powerInteractor = kosmos.powerInteractor,
		logger = kosmos.sceneLogger,
		motionEventHandlerReceiver = {},
		)
		.apply { setTransitionState(transitionState) }

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1682,6 +1682,7 @@ class SceneContainerStartableTest : SysuiTestCase() {
		underTest.start()

		// run all pending dismiss succeeded/cancelled calls from setup:
		runCurrent()
		kosmos.fakeExecutor.runAllReady()

		val dismissCallback: IKeyguardDismissCallback = mock()

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ 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
		import com.android.systemui.scene.shared.logger.sceneLogger
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.scene.shared.model.fakeSceneDataSource
		import com.android.systemui.testKosmos
		@@ -72,6 +73,7 @@ class SceneContainerViewModelTest : SysuiTestCase() {
		sceneInteractor = sceneInteractor,
		falsingInteractor = kosmos.falsingInteractor,
		powerInteractor = kosmos.powerInteractor,
		logger = kosmos.sceneLogger,
		motionEventHandlerReceiver = { motionEventHandler ->
		this@SceneContainerViewModelTest.motionEventHandler = motionEventHandler
		},

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

+5 −19

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@ import com.android.systemui.scene.domain.resolver.SceneResolver
		import com.android.systemui.scene.shared.logger.SceneLogger
		import com.android.systemui.scene.shared.model.SceneFamilies
		import com.android.systemui.scene.shared.model.Scenes
		import com.android.systemui.util.kotlin.getValue
		import com.android.systemui.util.kotlin.pairwiseBy
		import dagger.Lazy
		import javax.inject.Inject
		import kotlinx.coroutines.CoroutineScope
		@@ -83,20 +81,7 @@ constructor(
		* Note that during a transition between scenes, more than one scene might be rendered but only
		* one is considered the committed/current scene.
		*/
		val currentScene: StateFlow<SceneKey> =
		repository.currentScene
		.pairwiseBy(initialValue = repository.currentScene.value) { from, to ->
		logger.logSceneChangeCommitted(
		from = from,
		to = to,
		)
		to
		}
		.stateIn(
		scope = applicationScope,
		started = SharingStarted.WhileSubscribed(),
		initialValue = repository.currentScene.value,
		)
		val currentScene: StateFlow<SceneKey> = repository.currentScene

		/**
		* The current state of the transition.
		@@ -234,14 +219,15 @@ constructor(
		return
		}

		logger.logSceneChangeRequested(
		onSceneAboutToChangeListener.forEach { it.onSceneAboutToChange(resolvedScene, sceneState) }

		logger.logSceneChanged(
		from = currentSceneKey,
		to = resolvedScene,
		reason = loggingReason,
		isInstant = false,
		)

		onSceneAboutToChangeListener.forEach { it.onSceneAboutToChange(resolvedScene, sceneState) }
		repository.changeScene(resolvedScene, transitionKey)
		}

		@@ -274,7 +260,7 @@ constructor(
		return
		}

		logger.logSceneChangeRequested(
		logger.logSceneChanged(
		from = currentSceneKey,
		to = resolvedScene,
		reason = loggingReason,

packages/SystemUI/src/com/android/systemui/scene/shared/logger/SceneLogger.kt

+2 −17

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ class SceneLogger @Inject constructor(@SceneFrameworkLog private val logBuffer:
		)
		}

		fun logSceneChangeRequested(
		fun logSceneChanged(
		from: SceneKey,
		to: SceneKey,
		reason: String,
		@@ -60,7 +60,7 @@ class SceneLogger @Inject constructor(@SceneFrameworkLog private val logBuffer:
		},
		messagePrinter = {
		buildString {
		append("Scene change requested: $str1 → $str2")
		append("Scene changed: $str1 → $str2")
		if (isInstant) {
		append(" (instant)")
		}
		@@ -70,21 +70,6 @@ class SceneLogger @Inject constructor(@SceneFrameworkLog private val logBuffer:
		)
		}

		fun logSceneChangeCommitted(
		from: SceneKey,
		to: SceneKey,
		) {
		logBuffer.log(
		tag = TAG,
		level = LogLevel.INFO,
		messageInitializer = {
		str1 = from.toString()
		str2 = to.toString()
		},
		messagePrinter = { "Scene change committed: $str1 → $str2" },
		)
		}

		fun logSceneTransition(transitionState: ObservableTransitionState) {
		when (transitionState) {
		is ObservableTransitionState.Transition -> {