Merge "[Dual Shade] Remove remaining references to Flags.FLAG_DUAL_SHADE." into main

2 files changed, 17 insertions, 11 deletions

diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneContentViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneContentViewModelTest.kt
index e2d33b6fd3cc..cc94005a418c 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneContentViewModelTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneContentViewModelTest.kt
@@ -16,7 +16,6 @@
 
 package com.android.systemui.qs.ui.viewmodel
 
-import android.platform.test.annotations.DisableFlags
 import android.testing.TestableLooper.RunWithLooper
 import androidx.lifecycle.LifecycleOwner
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -39,6 +38,7 @@ import com.android.systemui.scene.domain.startable.sceneContainerStartable
 import com.android.systemui.scene.shared.model.Scenes
 import com.android.systemui.settings.brightness.ui.viewmodel.brightnessMirrorViewModelFactory
 import com.android.systemui.shade.data.repository.shadeRepository
+import com.android.systemui.shade.domain.interactor.disableDualShade
 import com.android.systemui.shade.domain.interactor.shadeInteractor
 import com.android.systemui.shade.ui.viewmodel.shadeHeaderViewModelFactory
 import com.android.systemui.testKosmos
@@ -58,7 +58,6 @@ import org.mockito.Mockito.verify
 @RunWith(AndroidJUnit4::class)
 @RunWithLooper
 @EnableSceneContainer
-@DisableFlags(com.android.systemui.Flags.FLAG_DUAL_SHADE)
 class QuickSettingsSceneContentViewModelTest : SysuiTestCase() {
 
     private val kosmos = testKosmos()
@@ -94,6 +93,7 @@ class QuickSettingsSceneContentViewModelTest : SysuiTestCase() {
                 sceneInteractor = sceneInteractor,
             )
         underTest.activateIn(testScope)
+        kosmos.disableDualShade()
     }
 
     @Test
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerHapticsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerHapticsViewModelTest.kt
index ca9500b5d74b..ef87eb3554aa 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerHapticsViewModelTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/SceneContainerHapticsViewModelTest.kt
@@ -37,6 +37,8 @@ import com.android.systemui.scene.domain.interactor.sceneInteractor
 import com.android.systemui.scene.sceneContainerHapticsViewModelFactory
 import com.android.systemui.scene.shared.model.Overlays
 import com.android.systemui.scene.shared.model.Scenes
+import com.android.systemui.shade.domain.interactor.disableDualShade
+import com.android.systemui.shade.domain.interactor.enableDualShade
 import com.android.systemui.testKosmos
 import com.google.android.msdl.data.model.MSDLToken
 import com.google.common.truth.Truth.assertThat
@@ -57,7 +59,7 @@ import org.mockito.kotlin.verifyNoMoreInteractions
 @SmallTest
 @RunWith(AndroidJUnit4::class)
 @EnableSceneContainer
-class SceneContainerHapticsViewModelTest() : SysuiTestCase() {
+class SceneContainerHapticsViewModelTest : SysuiTestCase() {
 
     private val kosmos = testKosmos()
     private val testScope = kosmos.testScope
@@ -74,10 +76,10 @@ class SceneContainerHapticsViewModelTest() : SysuiTestCase() {
     }
 
     @EnableFlags(Flags.FLAG_MSDL_FEEDBACK)
-    @DisableFlags(Flags.FLAG_DUAL_SHADE)
     @Test
     fun onValidSceneTransition_withMSDL_playsMSDLShadePullHaptics() =
         testScope.runTest {
+            kosmos.disableDualShade()
             // GIVEN a valid scene transition to play haptics
             val validTransition = createTransitionState(from = Scenes.Gone, to = Scenes.Shade)
 
@@ -91,10 +93,10 @@ class SceneContainerHapticsViewModelTest() : SysuiTestCase() {
         }
 
     @EnableFlags(Flags.FLAG_MSDL_FEEDBACK)
-    @DisableFlags(Flags.FLAG_DUAL_SHADE)
     @Test
     fun onInValidSceneTransition_withMSDL_doesNotPlayMSDLShadePullHaptics() =
         testScope.runTest {
+            kosmos.disableDualShade()
             // GIVEN an invalid scene transition to play haptics
             val invalidTransition = createTransitionState(from = Scenes.Shade, to = Scenes.Gone)
 
@@ -107,10 +109,11 @@ class SceneContainerHapticsViewModelTest() : SysuiTestCase() {
             assertThat(msdlPlayer.latestPropertiesPlayed).isNull()
         }
 
-    @DisableFlags(Flags.FLAG_DUAL_SHADE, Flags.FLAG_MSDL_FEEDBACK)
+    @DisableFlags(Flags.FLAG_MSDL_FEEDBACK)
     @Test
     fun onValidSceneTransition_withoutMSDL_playsHapticConstantForShadePullHaptics() =
         testScope.runTest {
+            kosmos.disableDualShade()
             // GIVEN a valid scene transition to play haptics
             val validTransition = createTransitionState(from = Scenes.Gone, to = Scenes.Shade)
 
@@ -122,10 +125,11 @@ class SceneContainerHapticsViewModelTest() : SysuiTestCase() {
             verify(view).performHapticFeedback(eq(HapticFeedbackConstants.GESTURE_START))
         }
 
-    @DisableFlags(Flags.FLAG_DUAL_SHADE, Flags.FLAG_MSDL_FEEDBACK)
+    @DisableFlags(Flags.FLAG_MSDL_FEEDBACK)
     @Test
     fun onInValidSceneTransition_withoutMSDL_doesNotPlayHapticConstantForShadePullHaptics() =
         testScope.runTest {
+            kosmos.disableDualShade()
             // GIVEN an invalid scene transition to play haptics
             val invalidTransition = createTransitionState(from = Scenes.Shade, to = Scenes.Gone)
 
@@ -137,10 +141,11 @@ class SceneContainerHapticsViewModelTest() : SysuiTestCase() {
             verifyNoMoreInteractions(view)
         }
 
-    @EnableFlags(Flags.FLAG_MSDL_FEEDBACK, Flags.FLAG_DUAL_SHADE)
+    @EnableFlags(Flags.FLAG_MSDL_FEEDBACK)
     @Test
     fun onValidOverlayTransition_withMSDL_playsMSDLShadePullHaptics() =
         testScope.runTest {
+            kosmos.enableDualShade()
             // GIVEN a valid scene transition to play haptics
             val validTransition =
                 createTransitionState(from = Scenes.Gone, to = Overlays.NotificationsShade)
@@ -154,10 +159,11 @@ class SceneContainerHapticsViewModelTest() : SysuiTestCase() {
             assertThat(msdlPlayer.latestPropertiesPlayed).isNull()
         }
 
-    @EnableFlags(Flags.FLAG_MSDL_FEEDBACK, Flags.FLAG_DUAL_SHADE)
+    @EnableFlags(Flags.FLAG_MSDL_FEEDBACK)
     @Test
     fun onInValidOverlayTransition_withMSDL_doesNotPlayMSDLShadePullHaptics() =
         testScope.runTest {
+            kosmos.enableDualShade()
             // GIVEN an invalid scene transition to play haptics
             val invalidTransition =
                 createTransitionState(from = Scenes.Bouncer, to = Overlays.NotificationsShade)
@@ -171,11 +177,11 @@ class SceneContainerHapticsViewModelTest() : SysuiTestCase() {
             assertThat(msdlPlayer.latestPropertiesPlayed).isNull()
         }
 
-    @EnableFlags(Flags.FLAG_DUAL_SHADE)
     @DisableFlags(Flags.FLAG_MSDL_FEEDBACK)
     @Test
     fun onValidOverlayTransition_withoutMSDL_playsHapticConstantForShadePullHaptics() =
         testScope.runTest {
+            kosmos.enableDualShade()
             // GIVEN a valid scene transition to play haptics
             val validTransition =
                 createTransitionState(from = Scenes.Gone, to = Overlays.NotificationsShade)
@@ -188,11 +194,11 @@ class SceneContainerHapticsViewModelTest() : SysuiTestCase() {
             verify(view).performHapticFeedback(eq(HapticFeedbackConstants.GESTURE_START))
         }
 
-    @EnableFlags(Flags.FLAG_DUAL_SHADE)
     @DisableFlags(Flags.FLAG_MSDL_FEEDBACK)
     @Test
     fun onInValidOverlayTransition_withoutMSDL_doesNotPlayHapticConstantForShadePullHaptics() =
         testScope.runTest {
+            kosmos.enableDualShade()
             // GIVEN an invalid scene transition to play haptics
             val invalidTransition =
                 createTransitionState(from = Scenes.Bouncer, to = Overlays.NotificationsShade)