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

Commit 41fde92f authored by helencheuk's avatar helencheuk
Browse files

[Action Corner] Action of the same action corner state should not be... 

[Action Corner] Action of the same action corner state should not be re-triggered after unlocking screen

Issue:
1. User moves cursor to an action corner, triggers an action. For example, the action is lockscreen.
2. Screen is locked, cursor does not move, user unlocks the screen.
3. Because the cursor is still in the same active corner, once the screen is unlocked and action corner state is re-subscribed, it thinks it is a new action corner and triggers lockscreen again.

The action corner state is already handled before locking screen, it should be ignored until the cursor leaves the action corner and re-enter it.

This CL adds distinctUntilChanged to make sure we only trigger action when the state is unhandled.

Bug: 436184783
Test: ActionCornerInteractorTest
Flag: com.android.systemui.shared.cursor_hot_corner

Change-Id: I3314803ae0a9d74aced7c51f3f37e2c7d0269df9
parent 5f5a3855

packages/SystemUI/multivalentTests/src/com/android/systemui/actioncorner/domain/interactor/ActionCornerInteractorTest.kt

+21 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import org.junit.Before 
import org.junit.runner.RunWith

import org.mockito.kotlin.mock

import org.mockito.kotlin.never

import org.mockito.kotlin.times

import org.mockito.kotlin.verify



@SmallTest
@@ -185,6 +186,26 @@ class ActionCornerInteractorTest : SysuiTestCase() { 
        verify(launcherProxyService, never()).onActionCornerActivated(OVERVIEW, DEFAULT_DISPLAY)

    }



    @Test

    fun activeActionCorner_lockscreen_actionNotReTriggeredAfterUnlock() = unlockScreenAndRunTest {

        settingsRepository.setInt(ACTION_CORNER_BOTTOM_LEFT_ACTION, ACTION_CORNER_ACTION_OVERVIEW)

        actionCornerRepository.addState(ActiveActionCorner(BOTTOM_LEFT, DEFAULT_DISPLAY))



        setTransition(

            sceneTransition = Idle(Scenes.Lockscreen),

            stateTransition =

                TransitionStep(from = KeyguardState.GONE, to = KeyguardState.LOCKSCREEN),

        )

        setTransition(

            sceneTransition = Idle(Scenes.Gone),

            stateTransition =

                TransitionStep(from = KeyguardState.LOCKSCREEN, to = KeyguardState.GONE),

        )

        actionCornerRepository.addState(ActiveActionCorner(BOTTOM_LEFT, DEFAULT_DISPLAY))



        verify(launcherProxyService, times(1)).onActionCornerActivated(OVERVIEW, DEFAULT_DISPLAY)

    }



    private fun unlockScreenAndRunTest(testBody: suspend Kosmos.() -> Unit) =

        kosmos.runTest {

            setTransition(

packages/SystemUI/src/com/android/systemui/actioncorner/domain/interactor/ActionCornerInteractor.kt

+3 −1
Original line number Diff line number Diff line
@@ -79,11 +79,13 @@ constructor( 
            }

            .flatMapLatest { shouldMonitorActionCorner ->

                if (shouldMonitorActionCorner) {

                    repository.actionCornerState.filterIsInstance<ActiveActionCorner>()

                    repository.actionCornerState

                } else {

                    emptyFlow()

                }

            }

            .distinctUntilChanged()

            .filterIsInstance<ActiveActionCorner>()

            .collect {

                val action = getAction(it.region)

                when (action) {