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

Commit 599ccdb9 authored by Luca Zuccarini's avatar Luca Zuccarini
Browse files

Use the right overlay when using an Expandable's transition controller. 

I noticed in my prototyping that sometimes `composeViewRoot.rootView`
here is different from the one provided as the `transitionContainer`.
This causes the drawable and the ghost view to be drawn in two
different overlays, which can result in the view never being covered
by the drawable. Reusing the already set `transitionContainer`
guarantees that the two are in the same overlay and that their
respective order is correct.

Bug: 323863002
Flag: EXEMPT bugfix
Test: I manually tested the current Compose launches (that I'm aware of) as well as the new call chip integration in my prototype.
Change-Id: I8e6f417e5a7a7a1e1fec37b1f61579a9335db732
parent 54635289

packages/SystemUI/compose/core/src/com/android/compose/animation/ExpandableController.kt

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ internal class ExpandableControllerImpl( 


            override fun onTransitionAnimationStart(isExpandingFullyAbove: Boolean) {

                delegate.onTransitionAnimationStart(isExpandingFullyAbove)

                overlay.value = composeViewRoot.rootView.overlay as ViewGroupOverlay

                overlay.value = transitionContainer.overlay as ViewGroupOverlay

                cujType?.let { InteractionJankMonitor.getInstance().begin(composeViewRoot, it) }

            }