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

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

Merge "[flexiglass] Update NSSL alpha during alt->prim bouncer transition" into main

parents ea289d63 9ed2bae6

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

+18 −4
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.ALTERNATE_BOUNCE 
import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER

import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow

import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition

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

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

import com.android.systemui.scene.ui.composable.transitions.TO_BOUNCER_FADE_FRACTION

import javax.inject.Inject

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow
@@ -36,9 +38,7 @@ import kotlinx.coroutines.flow.Flow 
@SysUISingleton

class AlternateBouncerToPrimaryBouncerTransitionViewModel

@Inject

constructor(

    animationFlow: KeyguardTransitionAnimationFlow,

) : DeviceEntryIconTransition {

constructor(animationFlow: KeyguardTransitionAnimationFlow) : DeviceEntryIconTransition {

    private val transitionAnimation =

        animationFlow

            .setup(
@@ -46,7 +46,21 @@ constructor( 
                edge = Edge.create(from = ALTERNATE_BOUNCER, to = Scenes.Bouncer),

            )

            .setupWithoutSceneContainer(

                edge = Edge.create(from = ALTERNATE_BOUNCER, to = PRIMARY_BOUNCER),

                edge = Edge.create(from = ALTERNATE_BOUNCER, to = PRIMARY_BOUNCER)

            )



    private val alphaForAnimationStep: (Float) -> Float =

        when {

            SceneContainerFlag.isEnabled -> { step ->

                    1f - Math.min((step / TO_BOUNCER_FADE_FRACTION), 1f)

                }

            else -> { step -> 1f - step }

        }



    val lockscreenAlpha: Flow<Float> =

        transitionAnimation.sharedFlow(

            duration = FromAlternateBouncerTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION,

            onStep = alphaForAnimationStep,

        )



    override val deviceEntryParentViewAlpha: Flow<Float> =

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModel.kt

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.PRIMARY_BOUNCER 
import com.android.systemui.keyguard.shared.model.StatusBarState.SHADE

import com.android.systemui.keyguard.shared.model.StatusBarState.SHADE_LOCKED

import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToGoneTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.AodBurnInViewModel

import com.android.systemui.keyguard.ui.viewmodel.AodToGoneTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.AodToLockscreenTransitionViewModel
@@ -124,6 +125,8 @@ constructor( 
    private val notificationStackAppearanceInteractor: NotificationStackAppearanceInteractor,

    private val alternateBouncerToGoneTransitionViewModel:

        AlternateBouncerToGoneTransitionViewModel,

    private val alternateBouncerToPrimaryBouncerTransitionViewModel:

        AlternateBouncerToPrimaryBouncerTransitionViewModel,

    private val aodToGoneTransitionViewModel: AodToGoneTransitionViewModel,

    private val aodToLockscreenTransitionViewModel: AodToLockscreenTransitionViewModel,

    private val aodToOccludedTransitionViewModel: AodToOccludedTransitionViewModel,
@@ -560,6 +563,7 @@ constructor( 
            lockscreenToGoneTransitionViewModel.notificationAlpha(viewState),

            lockscreenToOccludedTransitionViewModel.lockscreenAlpha,

            lockscreenToPrimaryBouncerTransitionViewModel.lockscreenAlpha,

            alternateBouncerToPrimaryBouncerTransitionViewModel.lockscreenAlpha,

            occludedToAodTransitionViewModel.lockscreenAlpha,

            occludedToGoneTransitionViewModel.notificationAlpha(viewState),

            occludedToLockscreenTransitionViewModel.lockscreenAlpha,

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/SharedNotificationContainerViewModelKosmos.kt

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.systemui.dump.dumpManager 
import com.android.systemui.keyguard.domain.interactor.keyguardInteractor

import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor

import com.android.systemui.keyguard.ui.viewmodel.alternateBouncerToGoneTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.alternateBouncerToPrimaryBouncerTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.aodBurnInViewModel

import com.android.systemui.keyguard.ui.viewmodel.aodToGoneTransitionViewModel

import com.android.systemui.keyguard.ui.viewmodel.aodToLockscreenTransitionViewModel
@@ -71,6 +72,8 @@ val Kosmos.sharedNotificationContainerViewModel by Fixture { 
        shadeInteractor = shadeInteractor,

        notificationStackAppearanceInteractor = notificationStackAppearanceInteractor,

        alternateBouncerToGoneTransitionViewModel = alternateBouncerToGoneTransitionViewModel,

        alternateBouncerToPrimaryBouncerTransitionViewModel =

            alternateBouncerToPrimaryBouncerTransitionViewModel,

        aodToGoneTransitionViewModel = aodToGoneTransitionViewModel,

        aodToLockscreenTransitionViewModel = aodToLockscreenTransitionViewModel,

        aodToOccludedTransitionViewModel = aodToOccludedTransitionViewModel,