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

Commit feb0815f authored by Chandru S's avatar Chandru S
Browse files

Make sure the lockscreen is not visible behind after Alternate bouncer -> primary bouncer 

Bug: 370555003
Test: verified manually,
 1. tap on a notification on the lockcscreen
 2. alternate bouncer will show up as a scrim over lockscreen
 3. swipe up or tap on the scrim
 4. bouncer should show up, and lockscreen should not bo visible behind the bouncer.
Test: unit tests pending, tracked here: b/???
Flag: com.android.systemui.bouncer_ui_revamp
Change-Id: I3a4e8a76f96dd88dc49230136cb22e336d6cee19
parent a1a641a6

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

+7 −1
Original line number Diff line number Diff line
@@ -30,9 +30,11 @@ import com.android.systemui.keyguard.ui.transitions.PrimaryBouncerTransition.Com 
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 com.android.systemui.window.flag.WindowBlurFlag

import javax.inject.Inject

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.emptyFlow



/**

 * Breaks down ALTERNATE BOUNCER->PRIMARY BOUNCER transition into discrete steps for corresponding
@@ -64,12 +66,16 @@ constructor( 
            else -> { step -> 1f - step }

        }



    val lockscreenAlpha: Flow<Float> =

    private val alphaFlow =

        transitionAnimation.sharedFlow(

            duration = FromAlternateBouncerTransitionInteractor.TO_PRIMARY_BOUNCER_DURATION,

            onStep = alphaForAnimationStep,

        )



    val lockscreenAlpha: Flow<Float> = if (WindowBlurFlag.isEnabled) alphaFlow else emptyFlow()



    val notificationAlpha: Flow<Float> = alphaFlow



    override val deviceEntryParentViewAlpha: Flow<Float> =

        transitionAnimation.immediatelyTransitionTo(0f)

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

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ constructor( 
        AlternateBouncerToLockscreenTransitionViewModel,

    private val alternateBouncerToOccludedTransitionViewModel:

        AlternateBouncerToOccludedTransitionViewModel,

    private val alternateBouncerToPrimaryBouncerTransitionViewModel:

        AlternateBouncerToPrimaryBouncerTransitionViewModel,

    private val aodToGoneTransitionViewModel: AodToGoneTransitionViewModel,

    private val aodToLockscreenTransitionViewModel: AodToLockscreenTransitionViewModel,

    private val aodToOccludedTransitionViewModel: AodToOccludedTransitionViewModel,
@@ -238,6 +240,7 @@ constructor( 
                        alternateBouncerToAodTransitionViewModel.lockscreenAlpha(viewState),

                        alternateBouncerToGoneTransitionViewModel.lockscreenAlpha(viewState),

                        alternateBouncerToLockscreenTransitionViewModel.lockscreenAlpha(viewState),

                        alternateBouncerToPrimaryBouncerTransitionViewModel.lockscreenAlpha,

                        alternateBouncerToOccludedTransitionViewModel.lockscreenAlpha,

                        aodToGoneTransitionViewModel.lockscreenAlpha(viewState),

                        aodToLockscreenTransitionViewModel.lockscreenAlpha(viewState),

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

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ constructor( 
            lockscreenToGoneTransitionViewModel.notificationAlpha(viewState),

            lockscreenToOccludedTransitionViewModel.lockscreenAlpha,

            lockscreenToPrimaryBouncerTransitionViewModel.lockscreenAlpha,

            alternateBouncerToPrimaryBouncerTransitionViewModel.lockscreenAlpha,

            alternateBouncerToPrimaryBouncerTransitionViewModel.notificationAlpha,

            occludedToAodTransitionViewModel.lockscreenAlpha,

            occludedToGoneTransitionViewModel.notificationAlpha(viewState),

            occludedToLockscreenTransitionViewModel.lockscreenAlpha,

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

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ val Kosmos.keyguardRootViewModel by Fixture { 
            alternateBouncerToLockscreenTransitionViewModel,

        alternateBouncerToOccludedTransitionViewModel =

            alternateBouncerToOccludedTransitionViewModel,

        alternateBouncerToPrimaryBouncerTransitionViewModel =

            alternateBouncerToPrimaryBouncerTransitionViewModel,

        aodToGoneTransitionViewModel = aodToGoneTransitionViewModel,

        aodToLockscreenTransitionViewModel = aodToLockscreenTransitionViewModel,

        aodToOccludedTransitionViewModel = aodToOccludedTransitionViewModel,