Merge "Add return animation functionality to TransitionAnimator." into main (a1c72639) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,9 @@ android_library {
		resource_dirs: [
		"tests/res",
		],
		asset_dirs: [
		"tests/goldens",
		],
		static_libs: [
		"SystemUI-res",
		"WifiTrackerLib",
		@@ -349,6 +352,8 @@ android_library {
		"androidx.test.ext.junit",
		"androidx.test.ext.truth",
		"kotlin-test",
		"platform-screenshot-diff-core",
		"PlatformMotionTesting",
		"SystemUICustomizationTestUtils",
		"androidx.compose.runtime_runtime",
		"kosmos",

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ android_library {
		"SystemUIShaderLib",
		"WindowManager-Shell-shared",
		"animationlib",
		"com_android_systemui_shared_flags_lib",
		],

		manifest: "AndroidManifest.xml",

+1 −1

Original line number	Diff line number	Diff line
		@@ -790,7 +790,7 @@ class ActivityTransitionAnimator(
		controller,
		endState,
		windowBackgroundColor,
		fadeOutWindowBackgroundLayer = !controller.isBelowAnimatingWindow,
		fadeWindowBackgroundLayer = !controller.isBelowAnimatingWindow,
		drawHole = !controller.isBelowAnimatingWindow,
		)
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -916,6 +916,12 @@ private class AnimatedDialog(
		endController.transitionContainer = value
		}

		// We tell TransitionController that this is always a launch, and handle the launch
		// vs return logic internally.
		// TODO(b/323863002): maybe move the launch vs return logic out of this class and
		// delegate it to TransitionController?
		override val isLaunching: Boolean = true

		override fun createAnimatorState(): TransitionAnimator.State {
		return startController.createAnimatorState()
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ constructor(
		private var interactionJankMonitor: InteractionJankMonitor =
		InteractionJankMonitor.getInstance(),
		) : ActivityTransitionAnimator.Controller {
		override val isLaunching: Boolean = true

		/** The container to which we will add the ghost view and expanding background. */
		override var transitionContainer = ghostedView.rootView as ViewGroup