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

Commit 988b1898 authored by Shawn Lee's avatar Shawn Lee Committed by Android (Google) Code Review
Browse files

Merge "Re-adding logic to hide launcher shortcuts when shade is open" into main

parents 3e30289c 42d2e603

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

+5 −0
Original line number Diff line number Diff line
@@ -49,8 +49,10 @@ import com.android.systemui.plugins.ActivityStarter 
import com.android.systemui.res.R

import com.android.systemui.settings.UserFileManager

import com.android.systemui.settings.UserTracker

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

import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots

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

import com.android.systemui.testKosmos

import com.android.systemui.util.FakeSharedPreferences

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

import com.android.systemui.util.mockito.whenever
@@ -93,6 +95,8 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { 
    private lateinit var dockManager: DockManagerFake

    private lateinit var biometricSettingsRepository: FakeBiometricSettingsRepository



    private val kosmos = testKosmos()



    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)
@@ -179,6 +183,7 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { 
        underTest =

            KeyguardQuickAffordanceInteractor(

                keyguardInteractor = withDeps.keyguardInteractor,

                shadeInteractor = kosmos.shadeInteractor,

                lockPatternUtils = lockPatternUtils,

                keyguardStateController = keyguardStateController,

                userTracker = userTracker,

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

+5 −2
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.systemui.keyguard.shared.quickaffordance.KeyguardQuickAfforda 
import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.res.R

import com.android.systemui.settings.UserTracker

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

import com.android.systemui.shared.customization.data.content.CustomizationProviderContract as Contract

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.statusbar.policy.KeyguardStateController
@@ -66,6 +67,7 @@ class KeyguardQuickAffordanceInteractor 
@Inject

constructor(

    private val keyguardInteractor: KeyguardInteractor,

    private val shadeInteractor: ShadeInteractor,

    private val lockPatternUtils: LockPatternUtils,

    private val keyguardStateController: KeyguardStateController,

    private val userTracker: UserTracker,
@@ -100,9 +102,10 @@ constructor( 
            quickAffordanceAlwaysVisible(position),

            keyguardInteractor.isDozing,

            keyguardInteractor.isKeyguardShowing,

            shadeInteractor.anyExpansion,

            biometricSettingsRepository.isCurrentUserInLockdown,

        ) { affordance, isDozing, isKeyguardShowing, isUserInLockdown ->

            if (!isDozing && isKeyguardShowing && !isUserInLockdown) {

        ) { affordance, isDozing, isKeyguardShowing, qsExpansion, isUserInLockdown ->

            if (!isDozing && isKeyguardShowing && (qsExpansion < 1.0f) && !isUserInLockdown) {

                affordance

            } else {

                KeyguardQuickAffordanceModel.Hidden

packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -53,9 +53,11 @@ import com.android.systemui.plugins.ActivityStarter 
import com.android.systemui.res.R

import com.android.systemui.settings.UserFileManager

import com.android.systemui.settings.UserTracker

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

import com.android.systemui.shared.customization.data.content.CustomizationProviderContract as Contract

import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots

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

import com.android.systemui.testKosmos

import com.android.systemui.util.FakeSharedPreferences

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

import com.android.systemui.util.mockito.mock
@@ -101,6 +103,8 @@ class CustomizationProviderTest : SysuiTestCase() { 
    private lateinit var underTest: CustomizationProvider

    private lateinit var testScope: TestScope



    private val kosmos = testKosmos()



    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)
@@ -185,6 +189,7 @@ class CustomizationProviderTest : SysuiTestCase() { 
                                },

                        )

                        .keyguardInteractor,

                shadeInteractor = kosmos.shadeInteractor,

                lockPatternUtils = lockPatternUtils,

                keyguardStateController = keyguardStateController,

                userTracker = userTracker,

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

+5 −0
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ import com.android.systemui.plugins.ActivityStarter 
import com.android.systemui.settings.FakeUserTracker

import com.android.systemui.settings.UserFileManager

import com.android.systemui.settings.UserTracker

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

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

import com.android.systemui.testKosmos

import com.android.systemui.util.FakeSharedPreferences

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

import com.android.systemui.util.mockito.mock
@@ -242,6 +244,8 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() { 
    private lateinit var biometricSettingsRepository: FakeBiometricSettingsRepository

    private lateinit var userTracker: UserTracker



    private val kosmos = testKosmos()



    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)
@@ -311,6 +315,7 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() { 
                            featureFlags = featureFlags,

                        )

                        .keyguardInteractor,

                shadeInteractor = kosmos.shadeInteractor,

                lockPatternUtils = lockPatternUtils,

                keyguardStateController = keyguardStateController,

                userTracker = userTracker,

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

+5 −0
Original line number Diff line number Diff line
@@ -54,9 +54,11 @@ import com.android.systemui.plugins.ActivityStarter 
import com.android.systemui.res.R

import com.android.systemui.settings.UserFileManager

import com.android.systemui.settings.UserTracker

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

import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots

import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper

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

import com.android.systemui.testKosmos

import com.android.systemui.util.FakeSharedPreferences

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

import com.android.systemui.util.mockito.mock
@@ -108,6 +110,8 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { 
    private lateinit var dockManager: DockManagerFake

    private lateinit var biometricSettingsRepository: FakeBiometricSettingsRepository



    private val kosmos = testKosmos()



    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)
@@ -221,6 +225,7 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { 
                quickAffordanceInteractor =

                    KeyguardQuickAffordanceInteractor(

                        keyguardInteractor = keyguardInteractor,

                        shadeInteractor = kosmos.shadeInteractor,

                        lockPatternUtils = lockPatternUtils,

                        keyguardStateController = keyguardStateController,

                        userTracker = userTracker,