Merge "Disable takeovers until we figure out how to make them work with Compose." into main (13824535) · Commits · e / os / android_frameworks_base

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)
		}

+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())
		}
		}