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

Commit 7ed3c2d9 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Rename CommunalSceneKey.Foo to CommunalScenes.Foo 

This CL changes the communal scenes accessors to CommunalScenes.Foo
instead of CommunalSceneKey.Foo, making them normal `val` instead of
objects. This will make the removal of the fork of STL SceneKey easier.

Bug: 293899074
Test: m sysuig
Test: m SystemUITests
Flag: N/A
Change-Id: Ide515fcf45e3fa757513f869bb5700d2c259436c
parent b571f1df

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

+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.compose.animation.scene.transitions 
import com.android.compose.animation.scene.updateSceneTransitionLayoutState

import com.android.compose.theme.LocalAndroidColorScheme

import com.android.systemui.communal.shared.model.CommunalSceneKey

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.communal.shared.model.ObservableCommunalTransitionState

import com.android.systemui.communal.ui.compose.extensions.allowGestures

import com.android.systemui.communal.ui.viewmodel.BaseCommunalViewModel
@@ -138,8 +139,8 @@ private fun SceneScope.CommunalScene( 


// TODO(b/315490861): Remove these conversions once Compose can be used throughout SysUI.

object TransitionSceneKey {

    val Blank = CommunalSceneKey.Blank.toTransitionSceneKey()

    val Communal = CommunalSceneKey.Communal.toTransitionSceneKey()

    val Blank = CommunalScenes.Blank.toTransitionSceneKey()

    val Communal = CommunalScenes.Communal.toTransitionSceneKey()

}



// TODO(b/315490861): Remove these conversions once Compose can be used throughout SysUI.

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/CommunalSceneStartableTest.kt

+24 −24
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.SysuiTestCase

import com.android.systemui.communal.domain.interactor.communalInteractor

import com.android.systemui.communal.domain.interactor.setCommunalAvailable

import com.android.systemui.communal.shared.model.CommunalSceneKey

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.dock.DockManager

import com.android.systemui.dock.dockManager
@@ -79,8 +79,8 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
            testScope.runTest {

                val scene by collectLastValue(communalInteractor.desiredScene)



                communalInteractor.onSceneChanged(CommunalSceneKey.Communal)

                assertThat(scene).isEqualTo(CommunalSceneKey.Communal)

                communalInteractor.onSceneChanged(CommunalScenes.Communal)

                assertThat(scene).isEqualTo(CommunalScenes.Communal)



                fakeKeyguardTransitionRepository.sendTransitionSteps(

                    from = KeyguardState.PRIMARY_BOUNCER,
@@ -88,7 +88,7 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
                    testScope = this

                )



                assertThat(scene).isEqualTo(CommunalSceneKey.Blank)

                assertThat(scene).isEqualTo(CommunalScenes.Blank)

            }

        }
@@ -97,7 +97,7 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
        with(kosmos) {

            testScope.runTest {

                val scene by collectLastValue(communalInteractor.desiredScene)

                assertThat(scene).isEqualTo(CommunalSceneKey.Blank)

                assertThat(scene).isEqualTo(CommunalScenes.Blank)



                updateDocked(true)

                fakeKeyguardTransitionRepository.sendTransitionSteps(
@@ -105,7 +105,7 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
                    to = KeyguardState.LOCKSCREEN,

                    testScope = this

                )

                assertThat(scene).isEqualTo(CommunalSceneKey.Communal)

                assertThat(scene).isEqualTo(CommunalScenes.Communal)

            }

        }
@@ -114,7 +114,7 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
        with(kosmos) {

            testScope.runTest {

                val scene by collectLastValue(communalInteractor.desiredScene)

                assertThat(scene).isEqualTo(CommunalSceneKey.Blank)

                assertThat(scene).isEqualTo(CommunalScenes.Blank)



                updateDocked(true)

                fakeKeyguardTransitionRepository.sendTransitionSteps(
@@ -122,7 +122,7 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
                    to = KeyguardState.LOCKSCREEN,

                    testScope = this

                )

                assertThat(scene).isEqualTo(CommunalSceneKey.Blank)

                assertThat(scene).isEqualTo(CommunalScenes.Blank)

            }

        }
@@ -131,19 +131,19 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
        with(kosmos) {

            testScope.runTest {

                val scene by collectLastValue(communalInteractor.desiredScene)

                communalInteractor.onSceneChanged(CommunalSceneKey.Communal)

                assertThat(scene).isEqualTo(CommunalSceneKey.Communal)

                communalInteractor.onSceneChanged(CommunalScenes.Communal)

                assertThat(scene).isEqualTo(CommunalScenes.Communal)



                fakeKeyguardTransitionRepository.sendTransitionSteps(

                    from = KeyguardState.GLANCEABLE_HUB,

                    to = KeyguardState.OFF,

                    testScope = this

                )

                assertThat(scene).isEqualTo(CommunalSceneKey.Communal)

                assertThat(scene).isEqualTo(CommunalScenes.Communal)



                advanceTimeBy(CommunalSceneStartable.AWAKE_DEBOUNCE_DELAY)



                assertThat(scene).isEqualTo(CommunalSceneKey.Blank)

                assertThat(scene).isEqualTo(CommunalScenes.Blank)

            }

        }
@@ -152,17 +152,17 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
        with(kosmos) {

            testScope.runTest {

                val scene by collectLastValue(communalInteractor.desiredScene)

                communalInteractor.onSceneChanged(CommunalSceneKey.Communal)

                assertThat(scene).isEqualTo(CommunalSceneKey.Communal)

                communalInteractor.onSceneChanged(CommunalScenes.Communal)

                assertThat(scene).isEqualTo(CommunalScenes.Communal)



                fakeKeyguardTransitionRepository.sendTransitionSteps(

                    from = KeyguardState.GLANCEABLE_HUB,

                    to = KeyguardState.OFF,

                    testScope = this

                )

                assertThat(scene).isEqualTo(CommunalSceneKey.Communal)

                assertThat(scene).isEqualTo(CommunalScenes.Communal)

                advanceTimeBy(CommunalSceneStartable.AWAKE_DEBOUNCE_DELAY / 2)

                assertThat(scene).isEqualTo(CommunalSceneKey.Communal)

                assertThat(scene).isEqualTo(CommunalScenes.Communal)



                fakeKeyguardTransitionRepository.sendTransitionSteps(

                    from = KeyguardState.OFF,
@@ -171,7 +171,7 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
                )



                advanceTimeBy(CommunalSceneStartable.AWAKE_DEBOUNCE_DELAY)

                assertThat(scene).isEqualTo(CommunalSceneKey.Communal)

                assertThat(scene).isEqualTo(CommunalScenes.Communal)

            }

        }
@@ -179,7 +179,7 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
    fun dockingOnLockscreen_forcesCommunal() =

        with(kosmos) {

            testScope.runTest {

                communalInteractor.onSceneChanged(CommunalSceneKey.Blank)

                communalInteractor.onSceneChanged(CommunalScenes.Blank)

                val scene by collectLastValue(communalInteractor.desiredScene)



                // device is docked while on the lockscreen
@@ -190,9 +190,9 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
                )

                updateDocked(true)



                assertThat(scene).isEqualTo(CommunalSceneKey.Blank)

                assertThat(scene).isEqualTo(CommunalScenes.Blank)

                advanceTimeBy(CommunalSceneStartable.DOCK_DEBOUNCE_DELAY)

                assertThat(scene).isEqualTo(CommunalSceneKey.Communal)

                assertThat(scene).isEqualTo(CommunalScenes.Communal)

            }

        }
@@ -200,7 +200,7 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
    fun dockingOnLockscreen_doesNotForceCommunalIfDreamStarts() =

        with(kosmos) {

            testScope.runTest {

                communalInteractor.onSceneChanged(CommunalSceneKey.Blank)

                communalInteractor.onSceneChanged(CommunalScenes.Blank)

                val scene by collectLastValue(communalInteractor.desiredScene)



                // device is docked while on the lockscreen
@@ -211,9 +211,9 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
                )

                updateDocked(true)



                assertThat(scene).isEqualTo(CommunalSceneKey.Blank)

                assertThat(scene).isEqualTo(CommunalScenes.Blank)

                advanceTimeBy(CommunalSceneStartable.DOCK_DEBOUNCE_DELAY / 2)

                assertThat(scene).isEqualTo(CommunalSceneKey.Blank)

                assertThat(scene).isEqualTo(CommunalScenes.Blank)



                // dream starts shortly after docking

                fakeKeyguardTransitionRepository.sendTransitionSteps(
@@ -222,7 +222,7 @@ class CommunalSceneStartableTest : SysuiTestCase() { 
                    testScope = this

                )

                advanceTimeBy(CommunalSceneStartable.DOCK_DEBOUNCE_DELAY)

                assertThat(scene).isEqualTo(CommunalSceneKey.Blank)

                assertThat(scene).isEqualTo(CommunalScenes.Blank)

            }

        }

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalRepositoryImplTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.systemui.communal.data.repository 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.communal.shared.model.CommunalSceneKey

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.communal.shared.model.ObservableCommunalTransitionState

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.testScope
@@ -60,13 +60,13 @@ class CommunalRepositoryImplTest : SysuiTestCase() { 
        testScope.runTest {

            val transitionState by collectLastValue(underTest.transitionState)

            assertThat(transitionState)

                .isEqualTo(ObservableCommunalTransitionState.Idle(CommunalSceneKey.DEFAULT))

                .isEqualTo(ObservableCommunalTransitionState.Idle(CommunalScenes.Default))

        }



    @Test

    fun transitionState_setTransitionState_returnsNewValue() =

        testScope.runTest {

            val expectedSceneKey = CommunalSceneKey.Communal

            val expectedSceneKey = CommunalScenes.Communal

            underTest.setTransitionState(

                flowOf(ObservableCommunalTransitionState.Idle(expectedSceneKey))

            )
@@ -81,7 +81,7 @@ class CommunalRepositoryImplTest : SysuiTestCase() { 
        testScope.runTest {

            // Set a value for the transition state flow.

            underTest.setTransitionState(

                flowOf(ObservableCommunalTransitionState.Idle(CommunalSceneKey.Communal))

                flowOf(ObservableCommunalTransitionState.Idle(CommunalScenes.Communal))

            )



            // Set the transition state flow back to null.
@@ -90,6 +90,6 @@ class CommunalRepositoryImplTest : SysuiTestCase() { 
            // Flow returns default scene key.

            val transitionState by collectLastValue(underTest.transitionState)

            assertThat(transitionState)

                .isEqualTo(ObservableCommunalTransitionState.Idle(CommunalSceneKey.DEFAULT))

                .isEqualTo(ObservableCommunalTransitionState.Idle(CommunalScenes.Default))

        }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt

+29 −31
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import com.android.systemui.communal.data.repository.fakeCommunalTutorialReposit 
import com.android.systemui.communal.data.repository.fakeCommunalWidgetRepository

import com.android.systemui.communal.domain.model.CommunalContentModel

import com.android.systemui.communal.shared.model.CommunalContentSize

import com.android.systemui.communal.shared.model.CommunalSceneKey

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.communal.shared.model.CommunalWidgetContentModel

import com.android.systemui.communal.shared.model.ObservableCommunalTransitionState

import com.android.systemui.communal.widgets.EditWidgetsActivityStarter
@@ -462,9 +462,9 @@ class CommunalInteractorTest : SysuiTestCase() { 


            var desiredScene = collectLastValue(underTest.desiredScene)

            runCurrent()

            assertThat(desiredScene()).isEqualTo(CommunalSceneKey.Blank)

            assertThat(desiredScene()).isEqualTo(CommunalScenes.Blank)



            val targetScene = CommunalSceneKey.Communal

            val targetScene = CommunalScenes.Communal

            communalRepository.setDesiredScene(targetScene)

            desiredScene = collectLastValue(underTest.desiredScene)

            runCurrent()
@@ -474,7 +474,7 @@ class CommunalInteractorTest : SysuiTestCase() { 
    @Test

    fun updatesScene() =

        testScope.runTest {

            val targetScene = CommunalSceneKey.Communal

            val targetScene = CommunalScenes.Communal



            underTest.onSceneChanged(targetScene)
@@ -491,26 +491,26 @@ class CommunalInteractorTest : SysuiTestCase() { 


            val desiredScene by collectLastValue(underTest.desiredScene)



            underTest.onSceneChanged(CommunalSceneKey.Communal)

            assertThat(desiredScene).isEqualTo(CommunalSceneKey.Communal)

            underTest.onSceneChanged(CommunalScenes.Communal)

            assertThat(desiredScene).isEqualTo(CommunalScenes.Communal)



            kosmos.setCommunalAvailable(false)

            runCurrent()



            // Scene returns blank when communal is not available.

            assertThat(desiredScene).isEqualTo(CommunalSceneKey.Blank)

            assertThat(desiredScene).isEqualTo(CommunalScenes.Blank)



            kosmos.setCommunalAvailable(true)

            runCurrent()



            // After re-enabling, scene goes back to Communal.

            assertThat(desiredScene).isEqualTo(CommunalSceneKey.Communal)

            assertThat(desiredScene).isEqualTo(CommunalScenes.Communal)

        }



    @Test

    fun transitionProgress_onTargetScene_fullProgress() =

        testScope.runTest {

            val targetScene = CommunalSceneKey.Blank

            val targetScene = CommunalScenes.Blank

            val transitionProgressFlow = underTest.transitionProgressToScene(targetScene)

            val transitionProgress by collectLastValue(transitionProgressFlow)
@@ -527,8 +527,8 @@ class CommunalInteractorTest : SysuiTestCase() { 
    @Test

    fun transitionProgress_notOnTargetScene_noProgress() =

        testScope.runTest {

            val targetScene = CommunalSceneKey.Blank

            val currentScene = CommunalSceneKey.Communal

            val targetScene = CommunalScenes.Blank

            val currentScene = CommunalScenes.Communal

            val transitionProgressFlow = underTest.transitionProgressToScene(targetScene)

            val transitionProgress by collectLastValue(transitionProgressFlow)
@@ -545,8 +545,8 @@ class CommunalInteractorTest : SysuiTestCase() { 
    @Test

    fun transitionProgress_transitioningToTrackedScene() =

        testScope.runTest {

            val currentScene = CommunalSceneKey.Communal

            val targetScene = CommunalSceneKey.Blank

            val currentScene = CommunalScenes.Communal

            val targetScene = CommunalScenes.Blank

            val transitionProgressFlow = underTest.transitionProgressToScene(targetScene)

            val transitionProgress by collectLastValue(transitionProgressFlow)
@@ -589,8 +589,8 @@ class CommunalInteractorTest : SysuiTestCase() { 
    @Test

    fun transitionProgress_transitioningAwayFromTrackedScene() =

        testScope.runTest {

            val currentScene = CommunalSceneKey.Blank

            val targetScene = CommunalSceneKey.Communal

            val currentScene = CommunalScenes.Blank

            val targetScene = CommunalScenes.Communal

            val transitionProgressFlow = underTest.transitionProgressToScene(currentScene)

            val transitionProgress by collectLastValue(transitionProgressFlow)
@@ -642,7 +642,7 @@ class CommunalInteractorTest : SysuiTestCase() { 
            runCurrent()

            assertThat(isCommunalShowing()).isEqualTo(false)



            underTest.onSceneChanged(CommunalSceneKey.Communal)

            underTest.onSceneChanged(CommunalScenes.Communal)



            isCommunalShowing = collectLastValue(underTest.isCommunalShowing)

            runCurrent()
@@ -666,12 +666,12 @@ class CommunalInteractorTest : SysuiTestCase() { 
            assertThat(isCommunalShowing).isFalse()



            // Verify scene changes (without the flag) to communal sets the value to true

            underTest.onSceneChanged(CommunalSceneKey.Communal)

            underTest.onSceneChanged(CommunalScenes.Communal)

            runCurrent()

            assertThat(isCommunalShowing).isTrue()



            // Verify scene changes (without the flag) to blank sets the value back to false

            underTest.onSceneChanged(CommunalSceneKey.Blank)

            underTest.onSceneChanged(CommunalScenes.Blank)

            runCurrent()

            assertThat(isCommunalShowing).isFalse()

        }
@@ -687,7 +687,7 @@ class CommunalInteractorTest : SysuiTestCase() { 
            assertThat(isCommunalShowing).isFalse()



            // Verify scene changes without the flag doesn't have any impact

            underTest.onSceneChanged(CommunalSceneKey.Communal)

            underTest.onSceneChanged(CommunalScenes.Communal)

            runCurrent()

            assertThat(isCommunalShowing).isFalse()
@@ -707,7 +707,7 @@ class CommunalInteractorTest : SysuiTestCase() { 
        testScope.runTest {

            val transitionState =

                MutableStateFlow<ObservableCommunalTransitionState>(

                    ObservableCommunalTransitionState.Idle(CommunalSceneKey.Blank)

                    ObservableCommunalTransitionState.Idle(CommunalScenes.Blank)

                )

            communalRepository.setTransitionState(transitionState)
@@ -717,8 +717,7 @@ class CommunalInteractorTest : SysuiTestCase() { 
            assertThat(isIdleOnCommunal).isEqualTo(false)



            // Transition to communal.

            transitionState.value =

                ObservableCommunalTransitionState.Idle(CommunalSceneKey.Communal)

            transitionState.value = ObservableCommunalTransitionState.Idle(CommunalScenes.Communal)

            runCurrent()



            // isIdleOnCommunal is now true since we're on communal.
@@ -727,8 +726,8 @@ class CommunalInteractorTest : SysuiTestCase() { 
            // Start transition away from communal.

            transitionState.value =

                ObservableCommunalTransitionState.Transition(

                    fromScene = CommunalSceneKey.Communal,

                    toScene = CommunalSceneKey.Blank,

                    fromScene = CommunalScenes.Communal,

                    toScene = CommunalScenes.Blank,

                    progress = flowOf(0f),

                    isInitiatedByUserInput = false,

                    isUserInputOngoing = flowOf(false),
@@ -744,7 +743,7 @@ class CommunalInteractorTest : SysuiTestCase() { 
        testScope.runTest {

            val transitionState =

                MutableStateFlow<ObservableCommunalTransitionState>(

                    ObservableCommunalTransitionState.Idle(CommunalSceneKey.Blank)

                    ObservableCommunalTransitionState.Idle(CommunalScenes.Blank)

                )

            communalRepository.setTransitionState(transitionState)
@@ -755,8 +754,8 @@ class CommunalInteractorTest : SysuiTestCase() { 
            // Start transition to communal.

            transitionState.value =

                ObservableCommunalTransitionState.Transition(

                    fromScene = CommunalSceneKey.Blank,

                    toScene = CommunalSceneKey.Communal,

                    fromScene = CommunalScenes.Blank,

                    toScene = CommunalScenes.Communal,

                    progress = flowOf(0f),

                    isInitiatedByUserInput = false,

                    isUserInputOngoing = flowOf(false),
@@ -766,8 +765,7 @@ class CommunalInteractorTest : SysuiTestCase() { 
            assertThat(isCommunalVisible).isEqualTo(true)



            // Finish transition to communal

            transitionState.value =

                ObservableCommunalTransitionState.Idle(CommunalSceneKey.Communal)

            transitionState.value = ObservableCommunalTransitionState.Idle(CommunalScenes.Communal)



            // isCommunalVisible is true since we're on communal.

            assertThat(isCommunalVisible).isEqualTo(true)
@@ -775,8 +773,8 @@ class CommunalInteractorTest : SysuiTestCase() { 
            // Start transition away from communal.

            transitionState.value =

                ObservableCommunalTransitionState.Transition(

                    fromScene = CommunalSceneKey.Communal,

                    toScene = CommunalSceneKey.Blank,

                    fromScene = CommunalScenes.Communal,

                    toScene = CommunalScenes.Blank,

                    progress = flowOf(1.0f),

                    isInitiatedByUserInput = false,

                    isUserInputOngoing = flowOf(false),

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalTutorialInteractorTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.systemui.Flags.FLAG_COMMUNAL_HUB 
import com.android.systemui.SysuiTestCase

import com.android.systemui.communal.data.repository.FakeCommunalTutorialRepository

import com.android.systemui.communal.data.repository.fakeCommunalTutorialRepository

import com.android.systemui.communal.shared.model.CommunalSceneKey

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.Flags

import com.android.systemui.flags.fakeFeatureFlagsClassic
@@ -158,7 +158,7 @@ class CommunalTutorialInteractorTest : SysuiTestCase() { 
            kosmos.setCommunalAvailable(true)

            communalTutorialRepository.setTutorialSettingState(HUB_MODE_TUTORIAL_NOT_STARTED)



            communalInteractor.onSceneChanged(CommunalSceneKey.Blank)

            communalInteractor.onSceneChanged(CommunalScenes.Blank)



            assertThat(tutorialSettingState).isEqualTo(HUB_MODE_TUTORIAL_NOT_STARTED)

        }
@@ -171,7 +171,7 @@ class CommunalTutorialInteractorTest : SysuiTestCase() { 
            goToCommunal()

            communalTutorialRepository.setTutorialSettingState(HUB_MODE_TUTORIAL_STARTED)



            communalInteractor.onSceneChanged(CommunalSceneKey.Blank)

            communalInteractor.onSceneChanged(CommunalScenes.Blank)



            assertThat(tutorialSettingState).isEqualTo(HUB_MODE_TUTORIAL_COMPLETED)

        }
@@ -184,13 +184,13 @@ class CommunalTutorialInteractorTest : SysuiTestCase() { 
            goToCommunal()

            communalTutorialRepository.setTutorialSettingState(HUB_MODE_TUTORIAL_COMPLETED)



            communalInteractor.onSceneChanged(CommunalSceneKey.Blank)

            communalInteractor.onSceneChanged(CommunalScenes.Blank)



            assertThat(tutorialSettingState).isEqualTo(HUB_MODE_TUTORIAL_COMPLETED)

        }



    private suspend fun goToCommunal() {

        kosmos.setCommunalAvailable(true)

        communalInteractor.onSceneChanged(CommunalSceneKey.Communal)

        communalInteractor.onSceneChanged(CommunalScenes.Communal)

    }

}