Do not expand/collapse shade after display move when flexiglass is off

Expanding/collapsing the shade is not supported using ShadeInteractor
for the legacy shade.
This cl removes that behaviour while SceneContainerFlag is off, making
the shade move work also for the legacy shade (and allowing us to turn
on the flag in trunk staging and write e2e tests already)

Bug: 362719719
Test: ShadeExpandedStateInteractorTest
Flag: com.android.systemui.shade_window_goes_around
Change-Id: I2f38f530802c50304bd7d4accf058c591bfa6930

1 files changed, 16 insertions, 8 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeExpandedStateInteractor.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeExpandedStateInteractor.kt
index 8b110e3ef792..c60a67f8c8d0 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeExpandedStateInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeExpandedStateInteractor.kt
@@ -110,13 +110,17 @@ constructor(
     @Background private val bgContext: CoroutineContext,
 ) : ShadeElement() {
     override suspend fun expand(reason: String) {
-        shadeInteractor.expandNotificationsShade(reason)
-        shadeInteractor.shadeExpansion.waitUntil(1f, bgContext)
+        if (SceneContainerFlag.isEnabled) {
+            shadeInteractor.expandNotificationsShade(reason)
+            shadeInteractor.shadeExpansion.waitUntil(1f, bgContext)
+        }
     }
 
     override suspend fun collapse(reason: String) {
-        shadeInteractor.collapseNotificationsShade(reason)
-        shadeInteractor.shadeExpansion.waitUntil(0f, bgContext)
+        if (SceneContainerFlag.isEnabled) {
+            shadeInteractor.collapseNotificationsShade(reason)
+            shadeInteractor.shadeExpansion.waitUntil(0f, bgContext)
+        }
     }
 }
 
@@ -128,12 +132,16 @@ constructor(
     @Background private val bgContext: CoroutineContext,
 ) : ShadeElement() {
     override suspend fun expand(reason: String) {
-        shadeInteractor.expandQuickSettingsShade(reason)
-        shadeInteractor.qsExpansion.waitUntil(1f, bgContext)
+        if (SceneContainerFlag.isEnabled) {
+            shadeInteractor.expandQuickSettingsShade(reason)
+            shadeInteractor.qsExpansion.waitUntil(1f, bgContext)
+        }
     }
 
     override suspend fun collapse(reason: String) {
-        shadeInteractor.collapseQuickSettingsShade(reason)
-        shadeInteractor.qsExpansion.waitUntil(0f, bgContext)
+        if (SceneContainerFlag.isEnabled) {
+            shadeInteractor.collapseQuickSettingsShade(reason)
+            shadeInteractor.qsExpansion.waitUntil(0f, bgContext)
+        }
     }
 }