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

Commit 87552eca authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge "Set shortcuts alpha when transitioning to/from hub" into main

parents 40bfa5ab 08ed252c

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

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ constructor( 


    val notificationAlpha: Flow<Float> = keyguardAlpha



    val shortcutsAlpha: Flow<Float> = keyguardAlpha



    val notificationTranslationX: Flow<Float> =

        keyguardTranslationX.map { it.value }.filterNotNull()

}

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

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ constructor( 
    occludedToLockscreenTransitionViewModel: OccludedToLockscreenTransitionViewModel,

    offToLockscreenTransitionViewModel: OffToLockscreenTransitionViewModel,

    primaryBouncerToLockscreenTransitionViewModel: PrimaryBouncerToLockscreenTransitionViewModel,

    glanceableHubToLockscreenTransitionViewModel: GlanceableHubToLockscreenTransitionViewModel,

    lockscreenToAodTransitionViewModel: LockscreenToAodTransitionViewModel,

    lockscreenToDozingTransitionViewModel: LockscreenToDozingTransitionViewModel,

    lockscreenToDreamingHostedTransitionViewModel: LockscreenToDreamingHostedTransitionViewModel,
@@ -59,6 +60,7 @@ constructor( 
    lockscreenToGoneTransitionViewModel: LockscreenToGoneTransitionViewModel,

    lockscreenToOccludedTransitionViewModel: LockscreenToOccludedTransitionViewModel,

    lockscreenToPrimaryBouncerTransitionViewModel: LockscreenToPrimaryBouncerTransitionViewModel,

    lockscreenToGlanceableHubTransitionViewModel: LockscreenToGlanceableHubTransitionViewModel,

    transitionInteractor: KeyguardTransitionInteractor,

) {
@@ -110,6 +112,7 @@ constructor( 
            occludedToLockscreenTransitionViewModel.shortcutsAlpha,

            offToLockscreenTransitionViewModel.shortcutsAlpha,

            primaryBouncerToLockscreenTransitionViewModel.shortcutsAlpha,

            glanceableHubToLockscreenTransitionViewModel.shortcutsAlpha,

        )



    /** alpha while fading the quick affordances in */
@@ -122,6 +125,7 @@ constructor( 
            lockscreenToGoneTransitionViewModel.shortcutsAlpha,

            lockscreenToOccludedTransitionViewModel.shortcutsAlpha,

            lockscreenToPrimaryBouncerTransitionViewModel.shortcutsAlpha,

            lockscreenToGlanceableHubTransitionViewModel.shortcutsAlpha,

            shadeExpansionAlpha,

        )

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

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ constructor( 


    val notificationAlpha: Flow<Float> = keyguardAlpha



    val shortcutsAlpha: Flow<Float> = keyguardAlpha



    val notificationTranslationX: Flow<Float> =

        keyguardTranslationX.map { it.value }.filterNotNull()

}

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

+15 −2
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import com.android.systemui.util.mockito.whenever 
import com.android.systemui.util.settings.FakeSettings

import com.google.common.truth.Truth

import kotlin.math.min

import kotlin.test.assertEquals

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.emptyFlow
@@ -77,7 +78,6 @@ import org.mockito.ArgumentMatchers 
import org.mockito.Mock

import org.mockito.Mockito

import org.mockito.MockitoAnnotations

import kotlin.test.assertEquals



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest
@@ -134,7 +134,12 @@ class KeyguardQuickAffordancesCombinedViewModelTest : SysuiTestCase() { 
    private lateinit var lockscreenToPrimaryBouncerTransitionViewModel:

        LockscreenToPrimaryBouncerTransitionViewModel

    @Mock

    private lateinit var transitionInteractor: KeyguardTransitionInteractor

    private lateinit var lockscreenToGlanceableHubTransitionViewModel:

        LockscreenToGlanceableHubTransitionViewModel

    @Mock

    private lateinit var glanceableHubToLockscreenTransitionViewModel:

        GlanceableHubToLockscreenTransitionViewModel

    @Mock private lateinit var transitionInteractor: KeyguardTransitionInteractor



    private lateinit var underTest: KeyguardQuickAffordancesCombinedViewModel
@@ -271,6 +276,10 @@ class KeyguardQuickAffordancesCombinedViewModelTest : SysuiTestCase() { 
        whenever(lockscreenToOccludedTransitionViewModel.shortcutsAlpha).thenReturn(emptyFlow())

        whenever(lockscreenToPrimaryBouncerTransitionViewModel.shortcutsAlpha)

            .thenReturn(emptyFlow())

        whenever(lockscreenToGlanceableHubTransitionViewModel.shortcutsAlpha)

            .thenReturn(emptyFlow())

        whenever(glanceableHubToLockscreenTransitionViewModel.shortcutsAlpha)

            .thenReturn(emptyFlow())

        whenever(shadeInteractor.anyExpansion).thenReturn(intendedShadeAlphaMutableStateFlow)

        whenever(transitionInteractor.finishedKeyguardState)

            .thenReturn(intendedFinishedKeyguardStateFlow)
@@ -307,6 +316,8 @@ class KeyguardQuickAffordancesCombinedViewModelTest : SysuiTestCase() { 
                offToLockscreenTransitionViewModel = offToLockscreenTransitionViewModel,

                primaryBouncerToLockscreenTransitionViewModel =

                    primaryBouncerToLockscreenTransitionViewModel,

                glanceableHubToLockscreenTransitionViewModel =

                    glanceableHubToLockscreenTransitionViewModel,

                lockscreenToAodTransitionViewModel = lockscreenToAodTransitionViewModel,

                lockscreenToDozingTransitionViewModel = lockscreenToDozingTransitionViewModel,

                lockscreenToDreamingHostedTransitionViewModel =
@@ -316,6 +327,8 @@ class KeyguardQuickAffordancesCombinedViewModelTest : SysuiTestCase() { 
                lockscreenToOccludedTransitionViewModel = lockscreenToOccludedTransitionViewModel,

                lockscreenToPrimaryBouncerTransitionViewModel =

                    lockscreenToPrimaryBouncerTransitionViewModel,

                lockscreenToGlanceableHubTransitionViewModel =

                    lockscreenToGlanceableHubTransitionViewModel,

                transitionInteractor = transitionInteractor,

            )

    }