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

Commit 19d3ac9c authored by Luca Zuccarini's avatar Luca Zuccarini
Browse files

Clean up unused navbar code from ActivityTransitionAnimator. 

Shell does not include the navbar in its transitions, so this code
has been obsolete since the switch to Shell.

Fix: 377643129
Flag: EXEMPT simple cleanup
Test: atest ActivityTransitionAnimator + manual check of CUJs
Change-Id: Ia69806fa93f70d38945ded7f58e8c3139ce417c8
parent 435b88b0

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

+2 −67
Original line number Diff line number Diff line
@@ -1279,12 +1279,7 @@ constructor( 
            val window = setUpAnimation(apps, callback) ?: return



            if (controller.windowAnimatorState == null || !longLivedReturnAnimationsEnabled()) {

                val navigationBar =

                    nonApps?.firstOrNull {

                        it.windowType == WindowManager.LayoutParams.TYPE_NAVIGATION_BAR

                    }



                startAnimation(window, navigationBar, iCallback = callback)

                startAnimation(window, iCallback = callback)

            } else {

                // If a [controller.windowAnimatorState] exists, treat this like a takeover.

                takeOverAnimationInternal(
@@ -1316,14 +1311,7 @@ constructor( 
        ) {

            val useSpring =

                !controller.isLaunching && startWindowState != null && startTransaction != null

            startAnimation(

                window,

                navigationBar = null,

                useSpring,

                startWindowState,

                startTransaction,

                callback,

            )

            startAnimation(window, useSpring, startWindowState, startTransaction, callback)

        }



        @UiThread
@@ -1428,7 +1416,6 @@ constructor( 


        private fun startAnimation(

            window: RemoteAnimationTarget,

            navigationBar: RemoteAnimationTarget? = null,

            useSpring: Boolean = false,

            startingWindowState: WindowAnimationState? = null,

            startTransaction: SurfaceControl.Transaction? = null,
@@ -1650,7 +1637,6 @@ constructor( 
                        linearProgress: Float,

                    ) {

                        applyStateToWindow(window, state, linearProgress, useSpring)

                        navigationBar?.let { applyStateToNavigationBar(it, state, linearProgress) }



                        listener?.onTransitionAnimationProgress(linearProgress)

                        delegate.onTransitionAnimationProgress(state, progress, linearProgress)
@@ -1826,57 +1812,6 @@ constructor( 
            transactionApplier.scheduleApply(params.build())

        }



        // TODO(b/377643129): remote transitions have no way of identifying the navbar when

        //  converting to RemoteAnimationTargets (and in my testing it was never included in the

        //  transition at all). So this method is not used anymore. Remove or adapt once we fully

        //  convert to remote transitions.

        private fun applyStateToNavigationBar(

            navigationBar: RemoteAnimationTarget,

            state: TransitionAnimator.State,

            linearProgress: Float,

        ) {

            if (transactionApplierView.viewRootImpl == null || !navigationBar.leash.isValid) {

                // Don't apply any transaction if the view root we synchronize with was detached or

                // if the SurfaceControl associated with [navigationBar] is not valid, as

                // [SyncRtSurfaceTransactionApplier.scheduleApply] would otherwise throw.

                return

            }



            val fadeInProgress =

                TransitionAnimator.getProgress(

                    TIMINGS,

                    linearProgress,

                    ANIMATION_DELAY_NAV_FADE_IN,

                    ANIMATION_DURATION_NAV_FADE_OUT,

                )



            val params = SyncRtSurfaceTransactionApplier.SurfaceParams.Builder(navigationBar.leash)

            if (fadeInProgress > 0) {

                matrix.reset()

                matrix.setTranslate(

                    0f,

                    (state.top - navigationBar.sourceContainerBounds.top).toFloat(),

                )

                windowCrop.set(state.left, 0, state.right, state.height)

                params

                    .withAlpha(NAV_FADE_IN_INTERPOLATOR.getInterpolation(fadeInProgress))

                    .withMatrix(matrix)

                    .withWindowCrop(windowCrop)

                    .withVisibility(true)

            } else {

                val fadeOutProgress =

                    TransitionAnimator.getProgress(

                        TIMINGS,

                        linearProgress,

                        0,

                        ANIMATION_DURATION_NAV_FADE_OUT,

                    )

                params.withAlpha(1f - NAV_FADE_OUT_INTERPOLATOR.getInterpolation(fadeOutProgress))

            }



            transactionApplier.scheduleApply(params.build())

        }



        private fun onAnimationTimedOut() {

            // The remote animation was cancelled by WM, so we already cancelled the transition

            // animation.