diff options
| author | 2024-08-29 11:35:49 +0000 | |
|---|---|---|
| committer | 2024-08-29 11:35:49 +0000 | |
| commit | 45cf186e2ff203132e06f8ab6b51aa4cf5dac1ee (patch) | |
| tree | 7797451894818a00b8ee613f5c7820066ab760f9 | |
| parent | 39f991f943135386edbae31d32d42b9c3bea59f4 (diff) | |
| parent | 81abce770945ef7a54f290bff616de802283a14d (diff) | |
Merge "Modify occluded for shade window take#2" into main
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/NotificationShadeWindowModel.kt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/NotificationShadeWindowModel.kt b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/NotificationShadeWindowModel.kt index f270e821840a..9c4bf1faf5cd 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/NotificationShadeWindowModel.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/NotificationShadeWindowModel.kt @@ -26,6 +26,7 @@ import com.android.systemui.scene.shared.model.Scenes import com.android.systemui.util.kotlin.BooleanFlowOperators.any import javax.inject.Inject import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map /** Models UI state for the shade window. */ @SysUISingleton @@ -42,9 +43,11 @@ constructor( val isKeyguardOccluded: Flow<Boolean> = listOf( // Finished in state... - keyguardTransitionInteractor.isFinishedIn(OCCLUDED), - keyguardTransitionInteractor.isFinishedIn(DREAMING), - keyguardTransitionInteractor.isFinishedIn(Scenes.Communal, GLANCEABLE_HUB), + keyguardTransitionInteractor.transitionValue(OCCLUDED).map { it == 1f }, + keyguardTransitionInteractor.transitionValue(DREAMING).map { it == 1f }, + keyguardTransitionInteractor.transitionValue(Scenes.Communal, GLANCEABLE_HUB).map { + it == 1f + }, // ... or transitions between those states keyguardTransitionInteractor.isInTransition(Edge.create(OCCLUDED, DREAMING)), |