Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02d27ef5 authored by Chandru S's avatar Chandru S
Browse files

Map swipe up on dream to go to the lockscreen instead of bouncer. 

Test: verified manually
Flag: com.android.systemui.scene_container
Fixes: 432335857
Change-Id: Ia9ce23a24159d70e9e05ba2d997a625f0203c5e6
parent 81e60723

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/ui/viewmodel/DreamUserActionsViewModelTest.kt

+3 −6
Original line number Original line Diff line number Diff line
@@ -73,8 +73,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { 




            setUpState(isShadeTouchable = true, isDeviceUnlocked = false)

            setUpState(isShadeTouchable = true, isDeviceUnlocked = false)

            assertThat(actions).isNotEmpty()

            assertThat(actions).isNotEmpty()

            assertThat(actions?.get(Swipe.Up))

            assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Lockscreen))

                .isEqualTo(UserActionResult.ShowOverlay(Overlays.Bouncer))

            assertThat(actions?.get(Swipe.Down)).isEqualTo(UserActionResult(Scenes.Shade))

            assertThat(actions?.get(Swipe.Down)).isEqualTo(UserActionResult(Scenes.Shade))

            assertThat(actions?.get(Swipe.Start)).isNull()

            assertThat(actions?.get(Swipe.Start)).isNull()

            assertThat(actions?.get(Swipe.End)).isNull()

            assertThat(actions?.get(Swipe.End)).isNull()
@@ -99,8 +98,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { 




            setUpState(isShadeTouchable = true, isDeviceUnlocked = false)

            setUpState(isShadeTouchable = true, isDeviceUnlocked = false)

            assertThat(actions).isNotEmpty()

            assertThat(actions).isNotEmpty()

            assertThat(actions?.get(Swipe.Up))

            assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Lockscreen))

                .isEqualTo(UserActionResult.ShowOverlay(Overlays.Bouncer))

            assertThat(actions?.get(Swipe.Down))

            assertThat(actions?.get(Swipe.Down))

                .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade))

                .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade))

            assertThat(actions?.get(Swipe.Start)).isNull()

            assertThat(actions?.get(Swipe.Start)).isNull()
@@ -127,8 +125,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { 




            setUpState(isShadeTouchable = true, isDeviceUnlocked = false)

            setUpState(isShadeTouchable = true, isDeviceUnlocked = false)

            assertThat(actions).isNotEmpty()

            assertThat(actions).isNotEmpty()

            assertThat(actions?.get(Swipe.Up))

            assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Lockscreen))

                .isEqualTo(UserActionResult.ShowOverlay(Overlays.Bouncer))

            assertThat(actions?.get(Swipe.Down))

            assertThat(actions?.get(Swipe.Down))

                .isEqualTo(UserActionResult.ShowOverlay(Overlays.NotificationsShade))

                .isEqualTo(UserActionResult.ShowOverlay(Overlays.NotificationsShade))

            assertThat(actions?.get(Swipe.Start)).isNull()

            assertThat(actions?.get(Swipe.Start)).isNull()

packages/SystemUI/src/com/android/systemui/dreams/ui/viewmodel/DreamUserActionsViewModel.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ import com.android.compose.animation.scene.Swipe 
import com.android.compose.animation.scene.UserAction

import com.android.compose.animation.scene.UserAction

import com.android.compose.animation.scene.UserActionResult

import com.android.compose.animation.scene.UserActionResult

import com.android.systemui.deviceentry.domain.interactor.DeviceUnlockedInteractor

import com.android.systemui.deviceentry.domain.interactor.DeviceUnlockedInteractor

import com.android.systemui.scene.shared.model.Overlays

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.ui.viewmodel.UserActionsViewModel

import com.android.systemui.scene.ui.viewmodel.UserActionsViewModel

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.shade.domain.interactor.ShadeInteractor
@@ -59,7 +58,7 @@ constructor( 
                                if (isDeviceUnlocked) {

                                if (isDeviceUnlocked) {

                                    add(Swipe.Up to Scenes.Gone)

                                    add(Swipe.Up to Scenes.Gone)

                                } else {

                                } else {

                                    add(Swipe.Up to Overlays.Bouncer)

                                    add(Swipe.Up to Scenes.Lockscreen)

                                }

                                }





                                addAll(

                                addAll(