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

Commit dc17ee2e authored by Danny Burakov's avatar Danny Burakov
Browse files

[flexiglass] Remove ShadeTestUtil.setSplitShade(). 

Bug: 444643845
Test: Unit test still passes.
Flag: com.android.systemui.scene_container
Change-Id: Ie53671e097e13873c89d8bc73abcd05dd6360fa5
parent 154dffb6

packages/SystemUI/tests/utils/src/com/android/systemui/shade/ShadeTestUtil.kt

+0 −31
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import com.android.compose.animation.scene.ObservableTransitionState 
import com.android.compose.animation.scene.OverlayKey

import com.android.compose.animation.scene.SceneKey

import com.android.systemui.SysuiTestableContext

import com.android.systemui.res.R

import com.android.systemui.scene.domain.interactor.SceneInteractor

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.scene.shared.model.Overlays
@@ -83,30 +82,18 @@ class ShadeTestUtil(val delegate: ShadeTestUtilDelegate) { 
        delegate.setTracking(tracking)

    }



    /** Sets the shade to half collapsed with no touch input. */

    fun programmaticCollapseShade() {

        delegate.assertFlagValid()

        delegate.programmaticCollapseShade()

    }



    fun setQsFullscreen(qsFullscreen: Boolean) {

        delegate.assertFlagValid()

        delegate.setQsFullscreen(qsFullscreen)



        // If QS is full screen, expansion is 1 and split shade is off.

        delegate.setQsExpansion(1.0f)

        delegate.setSplitShade(false)

    }



    fun setLegacyExpandedOrAwaitingInputTransfer(legacyExpandedOrAwaitingInputTransfer: Boolean) {

        delegate.assertFlagValid()

        delegate.setLegacyExpandedOrAwaitingInputTransfer(legacyExpandedOrAwaitingInputTransfer)

    }



    fun setSplitShade(splitShade: Boolean) {

        delegate.assertFlagValid()

        delegate.setSplitShade(splitShade)

    }

}



/** Sets up shade state for tests for a specific value of the scene container flag. */
@@ -138,8 +125,6 @@ interface ShadeTestUtilDelegate { 
    fun setQsFullscreen(qsFullscreen: Boolean)



    fun setLegacyExpandedOrAwaitingInputTransfer(legacyExpandedOrAwaitingInputTransfer: Boolean)



    fun setSplitShade(splitShade: Boolean)

}



/** Sets up shade state for tests when the scene container flag is disabled. */
@@ -203,14 +188,6 @@ class ShadeTestUtilLegacyImpl( 
        // may not flow fast enough to the stateIn

        shadeInteractor.isAnyFullyExpanded.value

    }



    override fun setSplitShade(splitShade: Boolean) {

        context

            .getOrCreateTestableResources()

            .addOverride(R.bool.config_use_split_notification_shade, splitShade)

        shadeRepository.setShadeLayoutWide(splitShade)

        testScope.runCurrent()

    }

}



/** Sets up shade state for tests when the scene container flag is enabled. */
@@ -390,14 +367,6 @@ class ShadeTestUtilSceneImpl( 
        testScope.runCurrent()

    }



    override fun setSplitShade(splitShade: Boolean) {

        context

            .getOrCreateTestableResources()

            .addOverride(R.bool.config_use_split_notification_shade, splitShade)

        shadeRepository.setShadeLayoutWide(splitShade)

        testScope.runCurrent()

    }



    override fun assertFlagValid() {

        Assert.assertTrue(SceneContainerFlag.isEnabled)

    }