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

Commit 4acfb49a authored by Darrell Shi's avatar Darrell Shi
Browse files

Remove SceneFamilies reference from dream user actions 

Fix: 379120080
Test: atest DreamUserActionsViewModelTest
Test: entering dream scene no longer crashes
Flag: com.android.systemui.scene_container
Change-Id: I606450790a6fdc7c70bb964c0f3d6d1b1bd8df2e
parent 222c7b1e

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/ui/viewmodel/DreamUserActionsViewModelTest.kt

+0 −7
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.se 
import com.android.systemui.power.domain.interactor.powerInteractor

import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.shared.model.Overlays

import com.android.systemui.scene.shared.model.SceneFamilies

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.shared.model.TransitionKeys.ToSplitShade

import com.android.systemui.shade.data.repository.fakeShadeRepository
@@ -83,7 +82,6 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { 
                shadeMode = ShadeMode.Single,

            )

            assertThat(actions).isNotEmpty()

            assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home))

            assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer))

            assertThat(actions?.get(Swipe.Down))

                .isEqualTo(UserActionResult(Scenes.Shade, isIrreversible = true))
@@ -101,7 +99,6 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { 
                shadeMode = ShadeMode.Single,

            )

            assertThat(actions).isNotEmpty()

            assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home))

            assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone))

            assertThat(actions?.get(Swipe.Down))

                .isEqualTo(UserActionResult(Scenes.Shade, isIrreversible = true))
@@ -119,7 +116,6 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { 
                shadeMode = ShadeMode.Split,

            )

            assertThat(actions).isNotEmpty()

            assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home))

            assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer))

            assertThat(actions?.get(Swipe.Down))

                .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true))
@@ -137,7 +133,6 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { 
                shadeMode = ShadeMode.Split,

            )

            assertThat(actions).isNotEmpty()

            assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home))

            assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone))

            assertThat(actions?.get(Swipe.Down))

                .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true))
@@ -155,7 +150,6 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { 
                shadeMode = ShadeMode.Dual,

            )

            assertThat(actions).isNotEmpty()

            assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home))

            assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer))

            assertThat(actions?.get(Swipe.Down))

                .isEqualTo(
@@ -171,7 +165,6 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { 


            setUpState(isShadeTouchable = true, isDeviceUnlocked = true, shadeMode = ShadeMode.Dual)

            assertThat(actions).isNotEmpty()

            assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home))

            assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone))

            assertThat(actions?.get(Swipe.Down))

                .isEqualTo(

packages/SystemUI/src/com/android/systemui/dreams/ui/viewmodel/DreamUserActionsViewModel.kt

+0 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import com.android.compose.animation.scene.Swipe 
import com.android.compose.animation.scene.UserAction

import com.android.compose.animation.scene.UserActionResult

import com.android.systemui.deviceentry.domain.interactor.DeviceUnlockedInteractor

import com.android.systemui.scene.shared.model.SceneFamilies

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.ui.viewmodel.UserActionsViewModel

import com.android.systemui.shade.domain.interactor.ShadeInteractor
@@ -60,9 +59,6 @@ constructor( 
                                    if (isDeviceUnlocked) Scenes.Gone else Scenes.Bouncer

                                add(Swipe.Up to bouncerOrGone)



                                // "Home" is either Dream, Lockscreen, or Gone.

                                add(Swipe.End to SceneFamilies.Home)



                                addAll(

                                    when (shadeMode) {

                                        ShadeMode.Single -> singleShadeActions()