d48bae09e60f - platform/frameworks/base

commit	d48bae09e60fdaa83fa04d4daa373b729aee7a99	[log] [tgz]
author	Josh Tsuji <tsuji@google.com>	Mon Jan 27 17:51:48 2025 -0500
committer	Josh Tsuji <tsuji@google.com>	Wed Feb 05 09:48:21 2025 -0500
tree	13ec005f93b56c27552724e2a7583c9051d12770
parent	4979bc95981c44df1b8994d9c7acd77cc225f35b [diff]

Support KeyguardService#showDismissibleKeyguard in keyguard_wm_state_refactor.

This CL is mostly renaming KeyguardLockWhileAwake and KeyguardLockNow to KeyguardShowWhileAwake/KeyguardServiceShowLockscreen to reflect that we're not necessarily locking the device.

The only logical changes are:
- KeyguardService asks KeyguardUpdateMonitor to delay locking instead of having KeyguardViewMediator do it, then calls KeyguardServiceShowLockscreenInteractor#onKeyguardServiceShowDismissibleKeyguard.
- That interactor now emits a ShowWhileAwakeReason, and an unused bundle is removed (didn't end up finding that actually was used).
- One collector of that flow (WakeDirectlyToGoneInteractor) filters out the fold events, the other just emits it into the existing showWhileAwakeEvents flow.

Fixes: 341400177
Test: fold my foldable
Flag: com.android.systemui.keyguard_wm_state_refactor
Change-Id: Ifd68d32326a221c420d2c3c1ecb3169391816021

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractorTest.kt[Renamed from packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractorTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorTest.kt[diff]
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java[diff]
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java[diff]
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractor.kt[diff]
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceLockNowInteractor.kt[Deleted - diff]
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractor.kt[Added - diff]
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractor.kt[Renamed from packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractor.kt - diff]
packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractor.kt[diff]
packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java[diff]
packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/FromGoneTransitionInteractorKosmos.kt[diff]
packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractor.kt[Renamed from packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceLockNowInteractor.kt - diff]
packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardShowWhileAwakeInteractorKosmos.kt[Renamed from packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardLockWhileAwakeInteractorKosmos.kt - diff]
packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardWakeDirectlyToGoneInteractorKosmos.kt[diff]

14 files changed

tree: 13ec005f93b56c27552724e2a7583c9051d12770