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

Commit 3328f7e2 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz
Browse files

[RONs] Add isOnAOD check to AOD Skeleton Visibility rules 

Bug: 399196522
Bug: 409563939
Bug: 397915451
Flag: android.app.ui_rich_ongoing
Test: RON skeleton must only be visible on AOD. Post a ron and validate.
Change-Id: Iffccc8aab915bd3df7c0dc649044cc7b9f574723
parent a6e6daf4

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(