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

Commit 1cc62112 authored by Luca Zuccarini's avatar Luca Zuccarini
Browse files

Only reparent for launch animations. 

Returns are currently not affected by the issue, and returning to the
Status Bar creates a flicker when reparenting.

Bug: 202516970
Flag: com.android.systemui.move_transition_animation_layer
Test: atest ActivityTransitionAnimator + manual validation
Change-Id: I011aa9580b528f2e45fd338f0f90a566daa889f6
parent faa3679e

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt

+6 −1
Original line number Diff line number Diff line
@@ -1476,9 +1476,14 @@ constructor( 
                transitionAnimator.isExpandingFullyAbove(controller.transitionContainer, endState)

            val windowState = startingWindowState ?: controller.windowAnimatorState



            // We only reparent launch animations. In current integrations, returns are

            // not affected by the issue solved by reparenting, and they present

            // additional problems when the view lives in the Status Bar.

            // TODO(b/397646693): remove this exception.

            val isEligibleForReparenting = controller.isLaunching

            val viewRoot = controller.transitionContainer.viewRootImpl

            val skipReparenting = skipReparentTransaction || viewRoot == null

            if (moveTransitionAnimationLayer() && !skipReparenting) {

            if (moveTransitionAnimationLayer() && isEligibleForReparenting && !skipReparenting) {

                reparent = true

            }