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

Commit dc762238 authored by Steve Elliott's avatar Steve Elliott
Browse files

[flexiglass] ShadeExpansionMgr is expanded on LS 

Flag: com.android.systemui.scene_container
Test: manual - receive a HUN on bypass lockscreen
Fixes: 433710797
Change-Id: I221b98abfc229e5bd4edfff3bb6bb41e00addb85
parent feaacaae

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/startable/ShadeStartableTest.kt

+8 −12
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor 
import com.android.systemui.scene.shared.model.Scenes

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

import com.android.systemui.shade.ShadeExpansionChangeEvent

import com.android.systemui.shade.ShadeExpansionListener

import com.android.systemui.shade.data.repository.fakeShadeDisplaysRepository

import com.android.systemui.shade.data.repository.shadeRepository

import com.android.systemui.shade.domain.interactor.enableDualShade
@@ -54,9 +53,6 @@ import com.android.systemui.statusbar.notification.stack.notificationStackScroll 
import com.android.systemui.statusbar.notificationShadeDepthController

import com.android.systemui.statusbar.phone.scrimController

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever

import com.google.common.truth.Truth.assertThat

import kotlin.math.max

import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -157,13 +153,8 @@ class ShadeStartableTest(flags: FlagsParameterization) : SysuiTestCase() { 
    fun hydrateShadeExpansionStateManager() =

        kosmos.runTest {

            enableSingleShade()

            val expansionListener = mock<ShadeExpansionListener>()

            var latestChangeEvent: ShadeExpansionChangeEvent? = null

            whenever(expansionListener.onPanelExpansionChanged(any())).thenAnswer {

                latestChangeEvent = it.arguments[0] as ShadeExpansionChangeEvent

                Unit

            }

            shadeExpansionStateManager.addExpansionListener(expansionListener)

            shadeExpansionStateManager.addExpansionListener { latestChangeEvent = it }



            underTest.start()
@@ -210,10 +201,15 @@ class ShadeStartableTest(flags: FlagsParameterization) : SysuiTestCase() { 
            assertThat(currentScene).isEqualTo(Scenes.QuickSettings)



            changeScene(Scenes.Lockscreen, transitionState) { progress ->

                if (!transitionState.value.isIdle(Scenes.Lockscreen)) {

                    assertThat(latestChangeEvent?.fraction).isZero()

                    assertThat(notificationShadeDepthController.shadeExpansion).isZero()

                } else {

                    assertThat(latestChangeEvent?.fraction).isEqualTo(1f)

                    assertThat(notificationShadeDepthController.shadeExpansion).isEqualTo(1f)

                }

                assertThat(notificationShadeDepthController.qsPanelExpansion)

                    .isEqualTo(1 - progress)

                assertThat(notificationShadeDepthController.shadeExpansion).isZero()

                assertThat(notificationShadeDepthController.transitionToFullShadeProgress)

                    .isEqualTo(1 - progress)

            }

packages/SystemUI/src/com/android/systemui/shade/domain/startable/ShadeStartable.kt

+7 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.systemui.log.LogBuffer 
import com.android.systemui.log.dagger.ShadeTouchLog

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

import com.android.systemui.scene.shared.flag.SceneContainerFlag

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

import com.android.systemui.shade.ShadeDisplayAware

import com.android.systemui.shade.ShadeExpansionStateManager

import com.android.systemui.shade.TouchLogger.Companion.logTouchesTo
@@ -91,10 +92,13 @@ constructor( 
            combine(

                    shadeInteractor.shadeExpansion,

                    sceneInteractorProvider.get().isTransitionUserInputOngoing,

                ) { panelExpansion, tracking ->

                    sceneInteractorProvider.get().transitionState,

                ) { panelExpansion, tracking, transitionState ->

                    val fraction =

                        if (transitionState.isIdle(Scenes.Lockscreen)) 1f else panelExpansion

                    shadeExpansionStateManager.onPanelExpansionChanged(

                        fraction = panelExpansion,

                        expanded = panelExpansion > 0f,

                        fraction = fraction,

                        expanded = fraction > 0f,

                        tracking = tracking,

                    )

                }