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

Commit f86109ed authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Fix notifications disappearing when shade fully expands." into tm-dev... 

Merge "Fix notifications disappearing when shade fully expands." into tm-dev am: 1a4f7b8b am: d4124684

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18890946



Change-Id: I21031efb6d2d58aed41c259e514dcbb42a899ed5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36fb5c37 d4124684

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt

+6 −6
Original line number Diff line number Diff line
@@ -265,12 +265,12 @@ class NotificationWakeUpCoordinator @Inject constructor( 
    }



    override fun onStateChanged(newState: Int) {

        if (screenOffAnimationController.overrideNotificationsFullyDozingOnKeyguard() &&

            state == StatusBarState.KEYGUARD &&

            newState == StatusBarState.SHADE) {

            // If we're animating the screen off and going from KEYGUARD back to SHADE, the

            // animation was cancelled and we are unlocking. Override the doze amount to 0f (not

            // dozing) so that the notifications are no longer hidden.

        if (state == StatusBarState.SHADE && newState == StatusBarState.SHADE) {

            // The SHADE -> SHADE transition is only possible as part of cancelling the screen-off

            // animation (e.g. by fingerprint unlock).  This is done because the system is in an

            // undefined state, so it's an indication that we should do state cleanup. We override

            // the doze amount to 0f (not dozing) so that the notifications are no longer hidden.

            // See: UnlockedScreenOffAnimationController.onFinishedWakingUp()

            setDozeAmount(0f, 0f)

        }