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

Commit 14529165 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Update scene check to use SceneResolvers" into main

parents 1a56b984 38baef23

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissActionInteractor.kt

+6 −4
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.ALTERNATE_BOUNCE 
import com.android.systemui.keyguard.shared.model.KeyguardState.GONE

import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER

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

import com.android.systemui.scene.domain.resolver.NotifShadeSceneFamilyResolver

import com.android.systemui.scene.domain.resolver.QuickSettingsSceneFamilyResolver

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

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

import com.android.systemui.util.kotlin.Utils.Companion.sampleFilter
@@ -57,6 +59,8 @@ constructor( 
    @Application private val applicationScope: CoroutineScope,

    sceneInteractor: SceneInteractor,

    deviceEntryInteractor: DeviceEntryInteractor,

    quickSettingsSceneFamilyResolver: QuickSettingsSceneFamilyResolver,

    notifShadeSceneFamilyResolver: NotifShadeSceneFamilyResolver,

) {

    val dismissAction: Flow<DismissAction> = repository.dismissAction
@@ -96,10 +100,8 @@ constructor( 
                deviceEntryInteractor.isUnlocked,

            ) { scene, isUnlocked ->

                isUnlocked &&

                    (scene == Scenes.Shade ||

                        scene == Scenes.NotificationsShade ||

                        scene == Scenes.QuickSettings ||

                        scene == Scenes.QuickSettingsShade)

                    (quickSettingsSceneFamilyResolver.includesScene(scene) ||

                        notifShadeSceneFamilyResolver.includesScene(scene))

            }

            .distinctUntilChanged()

    val executeDismissAction: Flow<() -> KeyguardDone> =

packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissActionInteractorTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ import com.android.systemui.scene.data.repository.Idle 
import com.android.systemui.scene.data.repository.Transition

import com.android.systemui.scene.data.repository.setSceneTransition

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

import com.android.systemui.scene.domain.resolver.notifShadeSceneFamilyResolver

import com.android.systemui.scene.domain.resolver.quickSettingsSceneFamilyResolver

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

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat
@@ -78,6 +80,8 @@ class KeyguardDismissActionInteractorTest : SysuiTestCase() { 
                applicationScope = testScope.backgroundScope,

                sceneInteractor = kosmos.sceneInteractor,

                deviceEntryInteractor = kosmos.deviceEntryInteractor,

                quickSettingsSceneFamilyResolver = kosmos.quickSettingsSceneFamilyResolver,

                notifShadeSceneFamilyResolver = kosmos.notifShadeSceneFamilyResolver,

            )

    }

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissActionInteractorKosmos.kt

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import com.android.systemui.keyguard.data.repository.keyguardRepository 
import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.testScope

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

import com.android.systemui.scene.domain.resolver.notifShadeSceneFamilyResolver

import com.android.systemui.scene.domain.resolver.quickSettingsSceneFamilyResolver

import kotlinx.coroutines.ExperimentalCoroutinesApi



@ExperimentalCoroutinesApi
@@ -33,5 +35,7 @@ val Kosmos.keyguardDismissActionInteractor by 
            applicationScope = testScope.backgroundScope,

            sceneInteractor = sceneInteractor,

            deviceEntryInteractor = deviceEntryInteractor,

            quickSettingsSceneFamilyResolver = quickSettingsSceneFamilyResolver,

            notifShadeSceneFamilyResolver = notifShadeSceneFamilyResolver,

        )

    }