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

Commit e44c79b9 authored by Luca Zuccarini's avatar Luca Zuccarini
Browse files

Disable takeovers until we figure out how to make them work with Compose. 

Bug: 202516970
Flag: com.android.systemui.status_bar_chips_return_animations
Test: atest ActivityTransitionAnimator
Change-Id: I7d6acfab3bf3d051801bd5930ebcc57f05211d31
parent 09558664

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

+4 −2
Original line number Diff line number Diff line
@@ -751,7 +751,8 @@ constructor( 
                OriginTransition(createLongLivedRunner(controllerFactory, scope, forLaunch = true)),

                "${cookie}_launchTransition",

            )

        transitionRegister.register(launchFilter, launchRemoteTransition, includeTakeover = true)

        // TODO(b/403529740): re-enable takeovers once we solve the Compose jank issues.

        transitionRegister.register(launchFilter, launchRemoteTransition, includeTakeover = false)



        // Cross-task close transitions should not use this animation, so we only register it for

        // when the opening window is Launcher.
@@ -777,7 +778,8 @@ constructor( 
                ),

                "${cookie}_returnTransition",

            )

        transitionRegister.register(returnFilter, returnRemoteTransition, includeTakeover = true)

        // TODO(b/403529740): re-enable takeovers once we solve the Compose jank issues.

        transitionRegister.register(returnFilter, returnRemoteTransition, includeTakeover = false)



        longLivedTransitions[cookie] = Pair(launchRemoteTransition, returnRemoteTransition)

    }

packages/SystemUI/tests/src/com/android/systemui/animation/ActivityTransitionAnimatorTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -249,10 +249,12 @@ class ActivityTransitionAnimatorTest : SysuiTestCase() { 
            var factory = controllerFactory(controller)

            underTest.register(factory.cookie, factory, testScope)

            assertEquals(2, testShellTransitions.remotes.size)

            assertTrue(testShellTransitions.remotesForTakeover.isEmpty())



            factory = controllerFactory(controller)

            underTest.register(factory.cookie, factory, testScope)

            assertEquals(4, testShellTransitions.remotes.size)

            assertTrue(testShellTransitions.remotesForTakeover.isEmpty())

        }

    }