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

Commit ed880e41 authored by Ale Nijamkin's avatar Ale Nijamkin
Browse files

[flexiglass] Don't switch to Shade when collapsing shades 

Fix: 404946372
Test: unit tests added
Test: manually verified that unlocking doesn't expand the shade anymore
Flag: com.android.systemui.scene_container
Change-Id: I76e3443fc3df2c77435bdddc64168b972fba266a
parent 2bcc948c

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ShadeControllerSceneImplTest.kt

+16 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor 
import com.android.systemui.scene.shared.model.Overlays

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

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

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

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.shade.domain.interactor.disableDualShade

import com.android.systemui.shade.domain.interactor.enableDualShade

import com.android.systemui.shade.domain.interactor.enableDualShade

import com.android.systemui.shade.domain.interactor.shadeInteractor

import com.android.systemui.shade.domain.interactor.shadeInteractor

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.CommandQueue
@@ -214,6 +215,21 @@ class ShadeControllerSceneImplTest : SysuiTestCase() { 
            assertThat(currentOverlays).isEmpty()

            assertThat(currentOverlays).isEmpty()

        }

        }





    @Test

    fun instantCollapseShade_singleShade_doesntSwitchToShadeScene() =

        testScope.runTest {

            kosmos.disableDualShade()

            runCurrent()

            val currentScene by collectLastValue(sceneInteractor.currentScene)

            val homeScene = currentScene

            sceneInteractor.changeScene(Scenes.QuickSettings, "")

            assertThat(currentScene).isEqualTo(Scenes.QuickSettings)



            underTest.instantCollapseShade()



            assertThat(currentScene).isEqualTo(homeScene)

        }



    private fun setScene(key: SceneKey) {

    private fun setScene(key: SceneKey) {

        sceneInteractor.changeScene(key, "test")

        sceneInteractor.changeScene(key, "test")

        sceneInteractor.setTransitionState(

        sceneInteractor.setTransitionState(

packages/SystemUI/src/com/android/systemui/shade/ShadeControllerSceneImpl.kt

+1 −0
Original line number Original line Diff line number Diff line
@@ -101,6 +101,7 @@ constructor( 
        shadeInteractor.collapseQuickSettingsShade(

        shadeInteractor.collapseQuickSettingsShade(

            loggingReason = "ShadeControllerSceneImpl.instantCollapseShade",

            loggingReason = "ShadeControllerSceneImpl.instantCollapseShade",

            transitionKey = Instant,

            transitionKey = Instant,

            bypassNotificationsShade = true,

        )

        )

    }

    }