diff options
6 files changed, 15 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 5d31d1e0e7af..6ef39f3ef40e 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -3214,6 +3214,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, mHideAnimationRun = false; adjustStatusBarLocked(); sendUserPresentBroadcast(); + + if (!KeyguardWmStateRefactor.isEnabled()) { + mKeyguardInteractor.dismissKeyguard(); + } } private Configuration.Builder createInteractionJankMonitorConf(int cuj) { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt index a4b4e7a0cf5f..8d107abab503 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractor.kt @@ -90,6 +90,7 @@ constructor( keyguardTransitionInteractor: KeyguardTransitionInteractor, sceneInteractorProvider: Provider<SceneInteractor>, private val fromGoneTransitionInteractor: Provider<FromGoneTransitionInteractor>, + private val fromLockscreenTransitionInteractor: Provider<FromLockscreenTransitionInteractor>, sharedNotificationContainerInteractor: Provider<SharedNotificationContainerInteractor>, @Application applicationScope: CoroutineScope, ) { @@ -425,6 +426,11 @@ constructor( fromGoneTransitionInteractor.get().showKeyguard() } + /** Temporary shim, until [KeyguardWmStateRefactor] is enabled */ + fun dismissKeyguard() { + fromLockscreenTransitionInteractor.get().dismissKeyguard() + } + companion object { private const val TAG = "KeyguardInteractor" } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java index 317e35c4948c..04fa5904d2e7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/QuickSettingsControllerImplBaseTest.java @@ -216,6 +216,7 @@ public class QuickSettingsControllerImplBaseTest extends SysuiTestCase { keyguardTransitionInteractor, () -> sceneInteractor, () -> mKosmos.getFromGoneTransitionInteractor(), + () -> mKosmos.getFromLockscreenTransitionInteractor(), () -> mKosmos.getSharedNotificationContainerInteractor(), mTestScope); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java index 8e9840acc414..dfee7374c104 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewControllerTest.java @@ -178,6 +178,7 @@ public class KeyguardStatusBarViewControllerTest extends SysuiTestCase { keyguardTransitionInteractor, () -> mKosmos.getSceneInteractor(), () -> mKosmos.getFromGoneTransitionInteractor(), + () -> mKosmos.getFromLockscreenTransitionInteractor(), () -> mKosmos.getSharedNotificationContainerInteractor(), mTestScope); mViewModel = diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorFactory.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorFactory.kt index 2e751cce7bad..02842cc3f56b 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorFactory.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorFactory.kt @@ -53,6 +53,7 @@ object KeyguardInteractorFactory { shadeRepository: FakeShadeRepository = FakeShadeRepository(), sceneInteractor: SceneInteractor = mock(), fromGoneTransitionInteractor: FromGoneTransitionInteractor = mock(), + fromLockscreenTransitionInteractor: FromLockscreenTransitionInteractor = mock(), sharedNotificationContainerInteractor: SharedNotificationContainerInteractor? = null, powerInteractor: PowerInteractor = PowerInteractorFactory.create().powerInteractor, testScope: CoroutineScope = TestScope(), @@ -98,6 +99,7 @@ object KeyguardInteractorFactory { keyguardTransitionInteractor = keyguardTransitionInteractor, sceneInteractorProvider = { sceneInteractor }, fromGoneTransitionInteractor = { fromGoneTransitionInteractor }, + fromLockscreenTransitionInteractor = { fromLockscreenTransitionInteractor }, sharedNotificationContainerInteractor = { sncInteractor }, applicationScope = testScope, ), diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorKosmos.kt index 1674044bc8fd..81d8f0b4ca53 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorKosmos.kt @@ -39,6 +39,7 @@ val Kosmos.keyguardInteractor: KeyguardInteractor by keyguardTransitionInteractor = keyguardTransitionInteractor, sceneInteractorProvider = { sceneInteractor }, fromGoneTransitionInteractor = { fromGoneTransitionInteractor }, + fromLockscreenTransitionInteractor = { fromLockscreenTransitionInteractor }, sharedNotificationContainerInteractor = { sharedNotificationContainerInteractor }, applicationScope = testScope.backgroundScope, ) |