summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author 0 <syeonlee@google.com> 2024-10-24 14:39:35 -0700
committer 0 <syeonlee@google.com> 2024-10-24 14:39:35 -0700
commit9bba534aa546ce5c463fbe02e4906d4968f8bde4 (patch)
tree827e2ba8298d43b392872c79d79313ca6fd5130d
parent5bc4afb9a41e2cfa8905e070bfee446bfa6f8a8e (diff)
[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
-rw-r--r--packages/SystemUI/src/com/android/systemui/scene/domain/startable/ScrimStartable.kt1
1 files changed, 1 insertions, 0 deletions
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)
}
}