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

Commit 07e9d8ae authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

[flexiglass] When occluded, swiping down always goes to shade. 

It doesn't go to QS, even if swiping down from the edge and even if
swiping down with two fingers.

Fix: 379843374
Test: unit test cases added before coding, coded until green (TDD)
Test: manually verified using double-tap power to occlude the lockscreen
with the camera app and then swipe down with one and with two fingers -
it always opened the shade scene and never QS
Test: made sure that edge and two finger swipe down does go to QS when
not occluded and as expected (no harm testing)
Flag: com.android.systemui.scene_container

Change-Id: Idc714fa678d5c1a99a2e958fb991336fb237c68f
parent d907df2d

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt

+13 −15
Original line number Diff line number Diff line
@@ -32,12 +32,11 @@ import com.android.systemui.Flags 
import com.android.systemui.SysuiTestCase

import com.android.systemui.authentication.data.repository.fakeAuthenticationRepository

import com.android.systemui.authentication.shared.model.AuthenticationMethodModel

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

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

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository

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

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.keyguard.data.repository.keyguardOcclusionRepository

import com.android.systemui.kosmos.testScope

import com.android.systemui.lifecycle.activateIn

import com.android.systemui.power.data.repository.fakePowerRepository
@@ -48,7 +47,6 @@ import com.android.systemui.scene.shared.model.Scenes 
import com.android.systemui.scene.shared.model.TransitionKeys

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

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

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

import com.android.systemui.testKosmos

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

import kotlin.math.pow
@@ -69,12 +67,13 @@ import platform.test.runner.parameterized.Parameters 
class LockscreenUserActionsViewModelTest : SysuiTestCase() {



    companion object {

        private const val parameterCount = 6

        private const val parameterCount = 7



        @Parameters(

            name =

                "canSwipeToEnter={0}, downWithTwoPointers={1}, downFromEdge={2}," +

                    " isSingleShade={3}, isCommunalAvailable={4}, isShadeTouchable={5}"

                    " isSingleShade={3}, isCommunalAvailable={4}, isShadeTouchable={5}," +

                    " isOccluded={6}"

        )

        @JvmStatic

        fun combinations() = buildList {
@@ -87,6 +86,7 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { 
                            /* isSingleShade= */ combination and 8 != 0,

                            /* isCommunalAvailable= */ combination and 16 != 0,

                            /* isShadeTouchable= */ combination and 32 != 0,

                            /* isOccluded= */ combination and 64 != 0,

                        )

                        .also { check(it.size == parameterCount) }

                )
@@ -116,10 +116,12 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { 
            downFromEdge: Boolean,

            isNarrowScreen: Boolean,

            isShadeTouchable: Boolean,

            isOccluded: Boolean,

        ): SceneKey? {

            return when {

                !isShadeTouchable -> null

                downFromEdge && isNarrowScreen -> Scenes.QuickSettings

                downFromEdge && isNarrowScreen && !isOccluded -> Scenes.QuickSettings

                downFromEdge && isNarrowScreen && isOccluded -> null

                else -> Scenes.Shade

            }

        }
@@ -168,8 +170,9 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { 
    @JvmField @Parameter(3) var isNarrowScreen: Boolean = true

    @JvmField @Parameter(4) var isCommunalAvailable: Boolean = false

    @JvmField @Parameter(5) var isShadeTouchable: Boolean = false

    @JvmField @Parameter(6) var isOccluded: Boolean = false



    private val underTest by lazy { createLockscreenSceneViewModel() }

    private val underTest by lazy { kosmos.lockscreenUserActionsViewModel }



    @Test

    @EnableFlags(Flags.FLAG_COMMUNAL_HUB)
@@ -196,6 +199,7 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { 
                        WakefulnessState.ASLEEP

                    }

            )

            kosmos.keyguardOcclusionRepository.setShowWhenLockedActivityInfo(onTop = isOccluded)



            val userActions by collectLastValue(underTest.actions)

            val downDestination =
@@ -217,6 +221,7 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { 
                        downFromEdge = downFromEdge,

                        isNarrowScreen = isNarrowScreen,

                        isShadeTouchable = isShadeTouchable,

                        isOccluded = isOccluded,

                    )

                )
@@ -285,6 +290,7 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { 
                        WakefulnessState.ASLEEP

                    }

            )

            kosmos.keyguardOcclusionRepository.setShowWhenLockedActivityInfo(onTop = isOccluded)



            val userActions by collectLastValue(underTest.actions)
@@ -354,12 +360,4 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { 
                    )

                )

        }



    private fun createLockscreenSceneViewModel(): LockscreenUserActionsViewModel {

        return LockscreenUserActionsViewModel(

            deviceEntryInteractor = kosmos.deviceEntryInteractor,

            communalInteractor = kosmos.communalInteractor,

            shadeInteractor = kosmos.shadeInteractor,

        )

    }

}

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModel.kt

+6 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.compose.animation.scene.UserAction 
import com.android.compose.animation.scene.UserActionResult

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

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

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

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

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

import com.android.systemui.shade.domain.interactor.ShadeInteractor
@@ -44,6 +45,7 @@ constructor( 
    private val deviceEntryInteractor: DeviceEntryInteractor,

    private val communalInteractor: CommunalInteractor,

    private val shadeInteractor: ShadeInteractor,

    private val occlusionInteractor: SceneContainerOcclusionInteractor,

) : UserActionsViewModel() {



    override suspend fun hydrateActions(setActions: (Map<UserAction, UserActionResult>) -> Unit) {
@@ -57,7 +59,8 @@ constructor( 
                    deviceEntryInteractor.isUnlocked,

                    communalInteractor.isCommunalAvailable,

                    shadeInteractor.shadeMode,

                ) { isDeviceUnlocked, isCommunalAvailable, shadeMode ->

                    occlusionInteractor.isOccludingActivityShown,

                ) { isDeviceUnlocked, isCommunalAvailable, shadeMode, isOccluded ->

                    buildList {

                            if (isCommunalAvailable) {

                                add(Swipe.Start to Scenes.Communal)
@@ -67,7 +70,8 @@ constructor( 


                            addAll(

                                when (shadeMode) {

                                    ShadeMode.Single -> singleShadeActions()

                                    ShadeMode.Single ->

                                        singleShadeActions(isDownFromTopEdgeEnabled = !isOccluded)

                                    ShadeMode.Split -> splitShadeActions()

                                    ShadeMode.Dual -> dualShadeActions()

                                }

packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt

+19 −15
Original line number Diff line number Diff line
@@ -27,24 +27,28 @@ import com.android.systemui.scene.ui.viewmodel.SceneContainerEdge 


/** Returns collection of [UserAction] to [UserActionResult] pairs for opening the single shade. */

fun singleShadeActions(

    requireTwoPointersForTopEdgeForQs: Boolean = false

    isDownFromTopEdgeEnabled: Boolean = true,

    requireTwoPointersForTopEdgeForQs: Boolean = false,

): Array<Pair<UserAction, UserActionResult>> {

    val shadeUserActionResult = UserActionResult(Scenes.Shade, isIrreversible = true)

    val qsSceneUserActionResult = UserActionResult(Scenes.QuickSettings, isIrreversible = true)

    return arrayOf(

    return buildList {

            // Swiping down, not from the edge, always goes to shade.

        Swipe.Down to shadeUserActionResult,

        Swipe.Down(pointerCount = 2) to shadeUserActionResult,



        // Swiping down from the top edge.

            add(Swipe.Down to shadeUserActionResult)

            add(Swipe.Down(pointerCount = 2) to shadeUserActionResult)

            if (isDownFromTopEdgeEnabled) {

                add(

                    swipeDownFromTop(pointerCount = 1) to

                        if (requireTwoPointersForTopEdgeForQs) {

                            shadeUserActionResult

                        } else {

                            qsSceneUserActionResult

            },

        swipeDownFromTop(pointerCount = 2) to qsSceneUserActionResult,

                        }

                )

                add(swipeDownFromTop(pointerCount = 2) to qsSceneUserActionResult)

            }

        }

        .toTypedArray()

}



/** Returns collection of [UserAction] to [UserActionResult] pairs for opening the split shade. */

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelKosmos.kt

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import com.android.systemui.communal.domain.interactor.communalInteractor 
import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.Kosmos.Fixture

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

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



val Kosmos.lockscreenUserActionsViewModel by Fixture {
@@ -27,5 +28,6 @@ val Kosmos.lockscreenUserActionsViewModel by Fixture { 
        deviceEntryInteractor = deviceEntryInteractor,

        communalInteractor = communalInteractor,

        shadeInteractor = shadeInteractor,

        occlusionInteractor = sceneContainerOcclusionInteractor,

    )

}