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

Unverified Commit 8ea0b4a8 authored by Tommy Webb's avatar Tommy Webb Committed by Michael Bestas
Browse files

Quick Settings power menu uses keyguard show state 

Issue: calyxos#2874
Change-Id: I6062fb3f66b19f498c0ea4fb7d253615073888c2
parent 570cf800

packages/SystemUI/src/com/android/systemui/qs/footer/domain/interactor/FooterActionsInteractor.kt

+3 −1
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.qs.footer.data.repository.ForegroundServicesReposito 
import com.android.systemui.qs.footer.domain.model.SecurityButtonConfig

import com.android.systemui.qs.footer.domain.model.SecurityButtonConfig

import com.android.systemui.security.data.repository.SecurityRepository

import com.android.systemui.security.data.repository.SecurityRepository

import com.android.systemui.statusbar.policy.DeviceProvisionedController

import com.android.systemui.statusbar.policy.DeviceProvisionedController

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.user.data.repository.UserSwitcherRepository

import com.android.systemui.user.data.repository.UserSwitcherRepository

import com.android.systemui.user.domain.interactor.UserSwitcherInteractor

import com.android.systemui.user.domain.interactor.UserSwitcherInteractor

import javax.inject.Inject

import javax.inject.Inject
@@ -100,6 +101,7 @@ constructor( 
    private val metricsLogger: MetricsLogger,

    private val metricsLogger: MetricsLogger,

    private val uiEventLogger: UiEventLogger,

    private val uiEventLogger: UiEventLogger,

    private val deviceProvisionedController: DeviceProvisionedController,

    private val deviceProvisionedController: DeviceProvisionedController,

    private val keyguardStateController: KeyguardStateController,

    private val qsSecurityFooterUtils: QSSecurityFooterUtils,

    private val qsSecurityFooterUtils: QSSecurityFooterUtils,

    private val fgsManagerController: FgsManagerController,

    private val fgsManagerController: FgsManagerController,

    private val userSwitcherInteractor: UserSwitcherInteractor,

    private val userSwitcherInteractor: UserSwitcherInteractor,
@@ -154,7 +156,7 @@ constructor( 
    ) {

    ) {

        uiEventLogger.log(GlobalActionsDialogLite.GlobalActionsEvent.GA_OPEN_QS)

        uiEventLogger.log(GlobalActionsDialogLite.GlobalActionsEvent.GA_OPEN_QS)

        globalActionsDialogLite.showOrHideDialog(

        globalActionsDialogLite.showOrHideDialog(

            /* keyguardShowing= */ false,

            keyguardStateController.isShowing(),

            /* isDeviceProvisioned= */ true,

            /* isDeviceProvisioned= */ true,

            expandable,

            expandable,

        )

        )

packages/SystemUI/tests/utils/src/com/android/systemui/qs/QuickSettingsKosmos.kt

+2 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel 
import com.android.systemui.security.data.repository.securityRepository

import com.android.systemui.security.data.repository.securityRepository

import com.android.systemui.settings.userTracker

import com.android.systemui.settings.userTracker

import com.android.systemui.statusbar.policy.deviceProvisionedController

import com.android.systemui.statusbar.policy.deviceProvisionedController

import com.android.systemui.statusbar.policy.keyguardStateController

import com.android.systemui.statusbar.policy.securityController

import com.android.systemui.statusbar.policy.securityController

import com.android.systemui.user.data.repository.userSwitcherRepository

import com.android.systemui.user.data.repository.userSwitcherRepository

import com.android.systemui.user.domain.interactor.userSwitcherInteractor

import com.android.systemui.user.domain.interactor.userSwitcherInteractor
@@ -78,6 +79,7 @@ val Kosmos.footerActionsInteractor by Fixture { 
        metricsLogger = metricsLogger,

        metricsLogger = metricsLogger,

        uiEventLogger = uiEventLogger,

        uiEventLogger = uiEventLogger,

        deviceProvisionedController = deviceProvisionedController,

        deviceProvisionedController = deviceProvisionedController,

        keyguardStateController = keyguardStateController,

        qsSecurityFooterUtils = qsSecurityFooterUtils,

        qsSecurityFooterUtils = qsSecurityFooterUtils,

        fgsManagerController = fgsManagerController,

        fgsManagerController = fgsManagerController,

        userSwitcherInteractor = userSwitcherInteractor,

        userSwitcherInteractor = userSwitcherInteractor,

packages/SystemUI/tests/utils/src/com/android/systemui/qs/footer/FooterActionsTestUtils.kt

+3 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.systemui.security.data.repository.SecurityRepositoryImpl 
import com.android.systemui.statusbar.policy.DeviceProvisionedController

import com.android.systemui.statusbar.policy.DeviceProvisionedController

import com.android.systemui.statusbar.policy.FakeSecurityController

import com.android.systemui.statusbar.policy.FakeSecurityController

import com.android.systemui.statusbar.policy.FakeUserInfoController

import com.android.systemui.statusbar.policy.FakeUserInfoController

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.statusbar.policy.SecurityController

import com.android.systemui.statusbar.policy.SecurityController

import com.android.systemui.statusbar.policy.UserInfoController

import com.android.systemui.statusbar.policy.UserInfoController

import com.android.systemui.statusbar.policy.UserSwitcherController

import com.android.systemui.statusbar.policy.UserSwitcherController
@@ -102,6 +103,7 @@ class FooterActionsTestUtils( 
        metricsLogger: MetricsLogger = FakeMetricsLogger(),

        metricsLogger: MetricsLogger = FakeMetricsLogger(),

        uiEventLogger: UiEventLogger = UiEventLoggerFake(),

        uiEventLogger: UiEventLogger = UiEventLoggerFake(),

        deviceProvisionedController: DeviceProvisionedController = mock(),

        deviceProvisionedController: DeviceProvisionedController = mock(),

        keyguardStateController: KeyguardStateController = mock(),

        qsSecurityFooterUtils: QSSecurityFooterUtils = mock(),

        qsSecurityFooterUtils: QSSecurityFooterUtils = mock(),

        fgsManagerController: FgsManagerController = mock(),

        fgsManagerController: FgsManagerController = mock(),

        userSwitcherInteractor: UserSwitcherInteractor = mock(),

        userSwitcherInteractor: UserSwitcherInteractor = mock(),
@@ -116,6 +118,7 @@ class FooterActionsTestUtils( 
            metricsLogger,

            metricsLogger,

            uiEventLogger,

            uiEventLogger,

            deviceProvisionedController,

            deviceProvisionedController,

            keyguardStateController,

            qsSecurityFooterUtils,

            qsSecurityFooterUtils,

            fgsManagerController,

            fgsManagerController,

            userSwitcherInteractor,

            userSwitcherInteractor,