commit 944f70a9f660d796c450f5108246e2697805eec1
author Jordan Demeulenaere <jdemeulenaere@google.com> Thu Nov 14 17:54:21 2024 +0100
committer Jordan Demeulenaere <jdemeulenaere@google.com> Tue Jan 21 13:02:54 2025 +0100
tree dd1883453c9c72d1930fb0932e05e8ed9bbafddf
parent 546eff8a3ec5bf1fad46380f9d758d77ea8d0213

Hide the other shade when showing the QS/notification shade in STL demo

Bug: 308961608
Test: Manual, used the STL demo app
Flag: EXEMPT demo app
Change-Id: I7bf0c367baee00d302860411c0250032e9e0c028

samples/SceneTransitionLayoutDemo/src/com/android/compose/animation/scene/demo/NotificationShade.kt

diff --git a/samples/SceneTransitionLayoutDemo/src/com/android/compose/animation/scene/demo/NotificationShade.kt b/samples/SceneTransitionLayoutDemo/src/com/android/compose/animation/scene/demo/NotificationShade.kt
index c36f3d8..aabea0e 100644
--- a/samples/SceneTransitionLayoutDemo/src/com/android/compose/animation/scene/demo/NotificationShade.kt
+++ b/samples/SceneTransitionLayoutDemo/src/com/android/compose/animation/scene/demo/NotificationShade.kt
@@ -27,6 +27,8 @@
 import com.android.compose.animation.scene.ElementKey
 import com.android.compose.animation.scene.Swipe
 import com.android.compose.animation.scene.UserActionResult
+import com.android.compose.animation.scene.UserActionResult.ShowOverlay
+import com.android.compose.animation.scene.UserActionResult.ShowOverlay.HideCurrentOverlays
 
 object NotificationShade {
     object Elements {
@@ -39,7 +41,10 @@
             Back to UserActionResult.HideOverlay(Overlays.Notifications),
             Swipe.Up to UserActionResult.HideOverlay(Overlays.Notifications),
             Swipe.Down(fromSource = SceneContainerEdge.TopEnd) to
-                UserActionResult.ReplaceByOverlay(Overlays.QuickSettings),
+                ShowOverlay(
+                    Overlays.QuickSettings,
+                    hideCurrentOverlays = HideCurrentOverlays.Some(Overlays.Notifications),
+                ),
         )
 }
 

samples/SceneTransitionLayoutDemo/src/com/android/compose/animation/scene/demo/QuickSettingsShade.kt

diff --git a/samples/SceneTransitionLayoutDemo/src/com/android/compose/animation/scene/demo/QuickSettingsShade.kt b/samples/SceneTransitionLayoutDemo/src/com/android/compose/animation/scene/demo/QuickSettingsShade.kt
index 630a88c..8fd4dbe 100644
--- a/samples/SceneTransitionLayoutDemo/src/com/android/compose/animation/scene/demo/QuickSettingsShade.kt
+++ b/samples/SceneTransitionLayoutDemo/src/com/android/compose/animation/scene/demo/QuickSettingsShade.kt
@@ -29,6 +29,8 @@
 import com.android.compose.animation.scene.ElementKey
 import com.android.compose.animation.scene.Swipe
 import com.android.compose.animation.scene.UserActionResult
+import com.android.compose.animation.scene.UserActionResult.ShowOverlay
+import com.android.compose.animation.scene.UserActionResult.ShowOverlay.HideCurrentOverlays
 
 object QuickSettingsShade {
     object Elements {
@@ -41,7 +43,10 @@
             Back to UserActionResult.HideOverlay(Overlays.QuickSettings),
             Swipe.Up to UserActionResult.HideOverlay(Overlays.QuickSettings),
             Swipe.Down(fromSource = SceneContainerEdge.TopStart) to
-                UserActionResult.ReplaceByOverlay(Overlays.Notifications),
+                ShowOverlay(
+                    Overlays.Notifications,
+                    hideCurrentOverlays = HideCurrentOverlays.Some(Overlays.QuickSettings),
+                ),
         )
 }