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

Commit 4fa64e0c authored by Shawn Lee's avatar Shawn Lee
Browse files

Revert^2 "Re-adding logic to hide launcher shortcuts when shade is open" 

This reverts commit 50aaabe4.

Reason for revert: Comment #18 on b/315576239 confirms the forward fix mitigated the original regression; hence this revert was unnecessary and should be undone to prevent the original issue b/267465887 from regressing.

Change-Id: If9e0aebba47a7778a7f6a7c32c83fedb281d9603
Merged-In: If9e0aebba47a7778a7f6a7c32c83fedb281d9603
parent 27b16136

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

+26 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.systemui.animation.DialogTransitionAnimator 
import com.android.systemui.common.shared.model.ContentDescription

import com.android.systemui.common.shared.model.Icon

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

import com.android.systemui.dock.DockManager

import com.android.systemui.dock.DockManagerFake

import com.android.systemui.flags.FakeFeatureFlags
@@ -49,6 +50,7 @@ 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.util.FakeSharedPreferences
@@ -57,6 +59,7 @@ import com.android.systemui.util.mockito.whenever 
import com.android.systemui.util.settings.FakeSettings

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.test.StandardTestDispatcher

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.runCurrent
@@ -80,6 +83,7 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { 
    @Mock private lateinit var activityStarter: ActivityStarter

    @Mock private lateinit var launchAnimator: DialogTransitionAnimator

    @Mock private lateinit var devicePolicyManager: DevicePolicyManager

    @Mock private lateinit var shadeInteractor: ShadeInteractor

    @Mock private lateinit var logger: KeyguardQuickAffordancesMetricsLogger



    private lateinit var underTest: KeyguardQuickAffordanceInteractor
@@ -179,6 +183,7 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { 
        underTest =

            KeyguardQuickAffordanceInteractor(

                keyguardInteractor = withDeps.keyguardInteractor,

                shadeInteractor = shadeInteractor,

                lockPatternUtils = lockPatternUtils,

                keyguardStateController = keyguardStateController,

                userTracker = userTracker,
@@ -193,6 +198,8 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { 
                backgroundDispatcher = testDispatcher,

                appContext = context,

            )



        whenever(shadeInteractor.anyExpansion).thenReturn(MutableStateFlow(0f))

    }



    @Test
@@ -338,6 +345,25 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { 
            assertThat(collectedValue()).isEqualTo(KeyguardQuickAffordanceModel.Hidden)

        }



    @Test

    fun quickAffordance_updateOncePerShadeExpansion() =

        testScope.runTest {

            val shadeExpansion = MutableStateFlow(0f)

            whenever(shadeInteractor.anyExpansion).thenReturn(shadeExpansion)



            val collectedValue by

                collectValues(

                    underTest.quickAffordance(KeyguardQuickAffordancePosition.BOTTOM_START)

                )



            val initialSize = collectedValue.size

            for (i in 0..10) {

                shadeExpansion.value = i / 10f

            }



            assertThat(collectedValue.size).isEqualTo(initialSize + 1)

        }



    @Test

    fun quickAffordanceAlwaysVisible_notVisible_restrictedByPolicyManager() =

        testScope.runTest {

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

+6 −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
@@ -55,6 +56,7 @@ import kotlinx.coroutines.CoroutineDispatcher 
import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.combine

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.flatMapLatest

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.flow.map
@@ -66,6 +68,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 +103,10 @@ constructor( 
            quickAffordanceAlwaysVisible(position),

            keyguardInteractor.isDozing,

            keyguardInteractor.isKeyguardShowing,

            shadeInteractor.anyExpansion.map { it < 1.0f }.distinctUntilChanged(),

            biometricSettingsRepository.isCurrentUserInLockdown,

        ) { affordance, isDozing, isKeyguardShowing, isUserInLockdown ->

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

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

            if (!isDozing && isKeyguardShowing && isQuickSettingsVisible && !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

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 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
@@ -218,6 +219,7 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { 
                quickAffordanceInteractor =

                    KeyguardQuickAffordanceInteractor(

                        keyguardInteractor = keyguardInteractor,

                        shadeInteractor = kosmos.shadeInteractor,

                        lockPatternUtils = lockPatternUtils,

                        keyguardStateController = keyguardStateController,

                        userTracker = userTracker,