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

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

Merge "Add DREAMING->LOCKSCREEN to model" into main

parents ac316924 1c0fa452

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

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ constructor( 
    private val aodToLockscreenTransitionViewModel: AodToLockscreenTransitionViewModel,

    private val dozingToGoneTransitionViewModel: DozingToGoneTransitionViewModel,

    private val dozingToLockscreenTransitionViewModel: DozingToLockscreenTransitionViewModel,

    private val dreamingToLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel,

    private val glanceableHubToLockscreenTransitionViewModel:

        GlanceableHubToLockscreenTransitionViewModel,

    private val goneToAodTransitionViewModel: GoneToAodTransitionViewModel,
@@ -171,6 +172,7 @@ constructor( 
                        aodToLockscreenTransitionViewModel.lockscreenAlpha(viewState),

                        dozingToGoneTransitionViewModel.lockscreenAlpha(viewState),

                        dozingToLockscreenTransitionViewModel.lockscreenAlpha,

                        dreamingToLockscreenTransitionViewModel.lockscreenAlpha,

                        glanceableHubToLockscreenTransitionViewModel.keyguardAlpha,

                        goneToAodTransitionViewModel.enterFromTopAnimationAlpha,

                        goneToDozingTransitionViewModel.lockscreenAlpha,

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

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ val Kosmos.keyguardRootViewModel by Fixture { 
        aodToLockscreenTransitionViewModel = aodToLockscreenTransitionViewModel,

        dozingToGoneTransitionViewModel = dozingToGoneTransitionViewModel,

        dozingToLockscreenTransitionViewModel = dozingToLockscreenTransitionViewModel,

        dreamingToLockscreenTransitionViewModel = dreamingToLockscreenTransitionViewModel,

        glanceableHubToLockscreenTransitionViewModel = glanceableHubToLockscreenTransitionViewModel,

        goneToAodTransitionViewModel = goneToAodTransitionViewModel,

        goneToDozingTransitionViewModel = goneToDozingTransitionViewModel,