diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractor.kt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractor.kt index 19d00cfea114..c7f262a2ac80 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractor.kt @@ -42,7 +42,7 @@ constructor( private val lightRevealScrimRepository: LightRevealScrimRepository, @Application private val scope: CoroutineScope, private val scrimLogger: ScrimLogger, - powerInteractor: PowerInteractor, + private val powerInteractor: PowerInteractor, ) { init { @@ -83,11 +83,13 @@ constructor( // (invisible) jank. However, we need to still pass through 1f and 0f to ensure that the // correct end states are respected even if the screen turned off (or was still off) // when the animation finished - powerInteractor.screenPowerState.value != ScreenPowerState.SCREEN_OFF || - it == 1f || - it == 0f + screenIsShowingContent() || it == 1f || it == 0f } + private fun screenIsShowingContent() = + powerInteractor.screenPowerState.value != ScreenPowerState.SCREEN_OFF && + powerInteractor.screenPowerState.value != ScreenPowerState.SCREEN_TURNING_ON + companion object { /** |