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

Commit c14ebc1b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Dual Shade] When transitioning between the shades, collapse at start." into main

parents 9a380758 431650a6

packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayActionsViewModelTest.kt

+6 −5
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ import androidx.test.filters.SmallTest 
import com.android.compose.animation.scene.Back

import com.android.compose.animation.scene.Swipe

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

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

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

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

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.EnableSceneContainer
@@ -75,9 +76,9 @@ class NotificationsShadeOverlayActionsViewModelTest : SysuiTestCase() { 
            val actions by collectLastValue(underTest.actions)

            underTest.activateIn(this)



            val action =

                (actions?.get(Swipe.Down(fromSource = SceneContainerArea.TopEdgeEndHalf))

                    as? ReplaceByOverlay)

            assertThat(action?.overlay).isEqualTo(Overlays.QuickSettingsShade)

            val action = actions?.get(Swipe.Down(fromSource = SceneContainerArea.TopEdgeEndHalf))

            assertThat((action as ShowOverlay).overlay).isEqualTo(Overlays.QuickSettingsShade)

            assertThat((action.hideCurrentOverlays as HideCurrentOverlays.Some).overlays)

                .containsExactly(Overlays.NotificationsShade)

        }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayActionsViewModelTest.kt

+6 −5
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ import androidx.test.filters.SmallTest 
import com.android.compose.animation.scene.Back

import com.android.compose.animation.scene.Swipe

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

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

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

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

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.EnableSceneContainer
@@ -111,9 +112,9 @@ class QuickSettingsShadeOverlayActionsViewModelTest : SysuiTestCase() { 
            val actions by collectLastValue(underTest.actions)

            underTest.activateIn(this)



            val action =

                (actions?.get(Swipe.Down(fromSource = SceneContainerArea.TopEdgeStartHalf))

                    as? ReplaceByOverlay)

            assertThat(action?.overlay).isEqualTo(Overlays.NotificationsShade)

            val action = actions?.get(Swipe.Down(fromSource = SceneContainerArea.TopEdgeStartHalf))

            assertThat((action as ShowOverlay).overlay).isEqualTo(Overlays.NotificationsShade)

            assertThat((action.hideCurrentOverlays as HideCurrentOverlays.Some).overlays)

                .containsExactly(Overlays.QuickSettingsShade)

        }

}

packages/SystemUI/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayActionsViewModel.kt

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

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

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

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

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

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

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

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

import com.android.systemui.scene.ui.viewmodel.UserActionsViewModel
@@ -38,7 +39,10 @@ class NotificationsShadeOverlayActionsViewModel @AssistedInject constructor() : 
                Swipe.Up to HideOverlay(Overlays.NotificationsShade),

                Back to HideOverlay(Overlays.NotificationsShade),

                Swipe.Down(fromSource = SceneContainerArea.TopEdgeEndHalf) to

                    ReplaceByOverlay(Overlays.QuickSettingsShade),

                    ShowOverlay(

                        Overlays.QuickSettingsShade,

                        hideCurrentOverlays = HideCurrentOverlays.Some(Overlays.NotificationsShade),

                    ),

            )

        )

    }

packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayActionsViewModel.kt

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

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

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

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

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

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

import com.android.systemui.qs.panels.ui.viewmodel.EditModeViewModel

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

import com.android.systemui.scene.ui.viewmodel.SceneContainerArea
@@ -50,7 +51,11 @@ constructor(private val editModeViewModel: EditModeViewModel) : UserActionsViewM 
                    }

                    put(

                        Swipe.Down(fromSource = SceneContainerArea.TopEdgeStartHalf),

                        ReplaceByOverlay(Overlays.NotificationsShade),

                        ShowOverlay(

                            Overlays.NotificationsShade,

                            hideCurrentOverlays =

                                HideCurrentOverlays.Some(Overlays.QuickSettingsShade),

                        ),

                    )

                }

            }