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

Commit 06aea261 authored by Christian Göllner's avatar Christian Göllner
Browse files

[Motion] Split-shade LS transition: fade media when it is not visible on LS 

Currently it is trying to perform a guided transition transformation,
but since media is not visible on lock screen, it does not work and
media is being translated from the bottom of the screen.

To fix it, we will change the transformation to be a fade.

Fixes: 223801943
Test: Manually + Unit tests
Change-Id: I1cb46afb9dc7d61b596395dd824f6b9c43152774
parent 9675d3b8

packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt

+6 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ class MediaHierarchyManager @Inject constructor( 
    @TransformationType

    fun calculateTransformationType(): Int {

        if (isTransitioningToFullShade) {

            if (inSplitShade) {

            if (inSplitShade && areGuidedTransitionHostsVisible()) {

                return TRANSFORMATION_TYPE_TRANSITION

            }

            return TRANSFORMATION_TYPE_FADE
@@ -829,6 +829,11 @@ class MediaHierarchyManager @Inject constructor( 
        return TRANSFORMATION_TYPE_TRANSITION

    }



    private fun areGuidedTransitionHostsVisible(): Boolean {

        return getHost(previousLocation)?.visible == true &&

                getHost(desiredLocation)?.visible == true

    }



    /**

     * @return the current transformation progress if we're in a guided transformation and -1

     * otherwise

packages/SystemUI/tests/src/com/android/systemui/media/MediaHierarchyManagerTest.kt

+12 −0
Original line number Diff line number Diff line
@@ -222,6 +222,18 @@ class MediaHierarchyManagerTest : SysuiTestCase() { 
        assertThat(transformType).isEqualTo(MediaHierarchyManager.TRANSFORMATION_TYPE_TRANSITION)

    }



    @Test

    fun calculateTransformationType_onLockSplitShade_goingToFullShade_mediaInvisible_returnsFade() {

        enableSplitShade()

        goToLockscreen()

        expandQS()

        whenever(lockHost.visible).thenReturn(false)

        mediaHiearchyManager.setTransitionToFullShadeAmount(10000f)



        val transformType = mediaHiearchyManager.calculateTransformationType()

        assertThat(transformType).isEqualTo(MediaHierarchyManager.TRANSFORMATION_TYPE_FADE)

    }



    @Test

    fun calculateTransformationType_onLockShade_inSplitShade_notExpanding_returnsFade() {

        enableSplitShade()