From 8dea409f7d9f61a8f5df7ae8aa2cb0abc60a7dd8 Mon Sep 17 00:00:00 2001 From: burakov Date: Tue, 12 Sep 2023 16:22:29 +0000 Subject: [flexiglass] Go back to lockscreen when swiping down on the Bouncer. Fix: 299341926 Test: Manually tested on a device by swiping down on the Bouncer and confirming that the lockscreen is shown. Change-Id: Idb203938766855b080108053c89c8be1e655f48b --- .../src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt index 81b9eb067e7f..e06a69bfaa63 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerScene.kt @@ -55,6 +55,7 @@ import com.android.systemui.bouncer.ui.viewmodel.PasswordBouncerViewModel import com.android.systemui.bouncer.ui.viewmodel.PatternBouncerViewModel import com.android.systemui.bouncer.ui.viewmodel.PinBouncerViewModel import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.scene.shared.model.Direction import com.android.systemui.scene.shared.model.SceneKey import com.android.systemui.scene.shared.model.SceneModel import com.android.systemui.scene.shared.model.UserAction @@ -82,9 +83,10 @@ constructor( override val key = SceneKey.Bouncer override fun destinationScenes(): StateFlow> = - MutableStateFlow>( + MutableStateFlow( mapOf( UserAction.Back to SceneModel(SceneKey.Lockscreen), + UserAction.Swipe(Direction.DOWN) to SceneModel(SceneKey.Lockscreen), ) ) .asStateFlow() -- cgit v1.2.3-59-g8ed1b