From 9bba534aa546ce5c463fbe02e4906d4968f8bde4 Mon Sep 17 00:00:00 2001 From: 0 Date: Thu, 24 Oct 2024 14:39:35 -0700 Subject: [flexiglass] Reset KeyguardFading/GoingAway after transition to Gone Due to ScrimController being deprecated in flexi, the codepath that reset KeyguardFadingAway/KeyguardGoingAway state was removed and not replaced. This brings it back in ScrimStartable. Bug: 372746998 Test: manually verified that trying to expand sensitive notifications in locked shade properly brings up bouncer Test: now passes ExpandSensitiveNotificationOnLockScreen Flag: com.android.systemui.scene_container Change-Id: Idd4bcb344332a5daf857304928974758ae4ca245 --- .../src/com/android/systemui/scene/domain/startable/ScrimStartable.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt index e352bfe938f6..857dbb7305e6 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt @@ -185,6 +185,7 @@ constructor( } else if (isOnKeyguard && !unlocking && isDreaming) { Model(scrimState = ScrimState.DREAMING, unlocking = false) } else { + onKeyguardFadedAway(transitionState.isIdle(Scenes.Gone)) Model(scrimState = ScrimState.UNLOCKED, unlocking = unlocking) } } -- cgit v1.2.3-59-g8ed1b