summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Justin Weir <justinweir@google.com> 2024-10-25 12:41:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-25 12:41:55 +0000
commitb95e6688dfda7e8131d34dd9dff1d75b688b0657 (patch)
tree487aaf106b57cb4f41f3c8c0f4bc4d42aefc7acb
parent3bb0c7b638c94e6214a4df8f155e7880225bdeec (diff)
parent9bba534aa546ce5c463fbe02e4906d4968f8bde4 (diff)
Merge "[flexiglass] Reset KeyguardFading/GoingAway after transition to Gone" into main
-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 55033f09e263..1d970349b955 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)
}
}