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

Commit 594bef17 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Fix media carousel view size for scene container 

In some cases an incorrect size could get cached in
MediaHostStatesManager and used in later layouts, even after we have a
scene container size - this adds a check to use the scene container size when
getting the view state

Flag: com.android.systemui.scene_container
Fixes: 371602434
Fixes: 390688474
Test: manual - view carousel with multiple players while rotating
Change-Id: Icd3fa1cf65e74a159170769ad8ec912502214a1d
parent c67522ec

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt

+15 −5
Original line number Diff line number Diff line
@@ -899,7 +899,11 @@ constructor( 
            // If the view isn't bound, we can drop the animation, otherwise we'll execute it

            animateNextStateChange = false

            if (transitionLayout == null) {

                logger.logMediaLocation("setCurrentState: view not bound", startLocation, endLocation)

                logger.logMediaLocation(

                    "setCurrentState: view not bound",

                    startLocation,

                    endLocation,

                )

                return

            }
@@ -973,13 +977,20 @@ constructor( 
        val overrideSize = mediaHostStatesManager.carouselSizes[location]

        var overridden = false

        overrideSize?.let {

            // To be safe we're using a maximum here. The override size should always be set

            // properly though.

            if (

            if (SceneContainerFlag.isEnabled) {

                result.measureWidth = widthInSceneContainerPx

                result.measureHeight = heightInSceneContainerPx

                overridden = true

            } else if (

                result.measureHeight != it.measuredHeight || result.measureWidth != it.measuredWidth

            ) {

                // To be safe we're using a maximum here. The override size should always be set

                // properly though.

                result.measureHeight = Math.max(it.measuredHeight, result.measureHeight)

                result.measureWidth = Math.max(it.measuredWidth, result.measureWidth)

                overridden = true

            }

            if (overridden) {

                // The measureHeight and the shown height should both be set to the overridden

                // height

                result.height = result.measureHeight
@@ -991,7 +1002,6 @@ constructor( 
                        state.width = result.width

                    }

                }

                overridden = true

            }

        }

        if (overridden && state != null && state.squishFraction <= 1f) {