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

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

Merge "[RONs] Add isOnAOD check to AOD Skeleton Visibility rules" into main

parents 1baceb4c 3328f7e2

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

+3 −2
Original line number Diff line number Diff line
@@ -324,14 +324,15 @@ constructor( 


    val isAodPromotedNotifVisible: StateFlow<AnimatedValue<Boolean>> =

        combine(

                keyguardTransitionInteractor.transitionValue(AOD).map { it == 1f },

                areNotifsFullyHiddenAnimated(),

                isPulseExpandingAnimated(),

                aodPromotedNotificationInteractor.isPresent,

            ) { notifsFullyHiddenAnimated, pulseExpandingAnimated, haveAodPromotedNotif ->

            ) { isOnAOD, notifsFullyHiddenAnimated, pulseExpandingAnimated, haveAodPromotedNotif ->

                zip(notifsFullyHiddenAnimated, pulseExpandingAnimated) {

                    notifsFullyHidden,

                    pulseExpanding ->

                    notifsFullyHidden && !pulseExpanding && haveAodPromotedNotif

                    isOnAOD && notifsFullyHidden && !pulseExpanding && haveAodPromotedNotif

                }

            }

            .stateIn(