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

Commit f9ed2449 authored Dec 29, 2023 by Jordan Demeulenaere

Rename SharedElementScenePicker to ElementScenePicker (1/2)

Bug: 291071158
Test: N/A. Pure renaming.
Flag: N/A
Change-Id: I4bc599ce1c636e30a78ba5a25eac98216116af5a

parent a97396b9

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -291,7 +291,7 @@ internal fun shouldDrawOrComposeSharedElement(
	scene: SceneKey,		scene: SceneKey,
	element: ElementKey,		element: ElementKey,
	): Boolean {		): Boolean {
	val scenePicker = element.scenePicker ?: DefaultSharedElementScenePicker		val scenePicker = element.scenePicker ?: DefaultElementScenePicker
	val fromScene = transition.fromScene		val fromScene = transition.fromScene
	val toScene = transition.toScene		val toScene = transition.toScene

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -70,10 +70,10 @@ class ElementKey(
	val isBackground: Boolean = false,		val isBackground: Boolean = false,

	/**		/**
	* The [SharedElementScenePicker] to use when deciding in which scene we should draw or compose		* The [ElementScenePicker] to use when deciding in which scene we should draw or compose this
	* this element when it is shared.		* element when it is shared.
	*/		*/
	val scenePicker: SharedElementScenePicker? = null,		val scenePicker: ElementScenePicker? = null,
	) : Key(name, identity), ElementMatcher {		) : Key(name, identity), ElementMatcher {
	@VisibleForTesting		@VisibleForTesting
	// TODO(b/240432457): Make internal once PlatformComposeSceneTransitionLayoutTestsUtils can		// TODO(b/240432457): Make internal once PlatformComposeSceneTransitionLayoutTestsUtils can

packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDsl.kt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -130,7 +130,7 @@ interface TransitionBuilder : PropertyTransformationBuilder {
	fun reversed(builder: TransitionBuilder.() -> Unit)		fun reversed(builder: TransitionBuilder.() -> Unit)
	}		}

	interface SharedElementScenePicker {		interface ElementScenePicker {
	/**		/**
	* Return the scene in which [element] should be drawn (when using `Modifier.element(key)`) or		* Return the scene in which [element] should be drawn (when using `Modifier.element(key)`) or
	* composed (when using `MovableElement(key)`) during the given [transition].		* composed (when using `MovableElement(key)`) during the given [transition].
	@@ -183,7 +183,7 @@ interface SharedElementScenePicker {
	}		}
	}		}

	object DefaultSharedElementScenePicker : SharedElementScenePicker {		object DefaultElementScenePicker : ElementScenePicker {
	override fun sceneDuringTransition(		override fun sceneDuringTransition(
	element: ElementKey,		element: ElementKey,
	transition: TransitionState.Transition,		transition: TransitionState.Transition,

packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MovableElementTest.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -151,7 +151,7 @@ class MovableElementTest {
	ElementKey(		ElementKey(
	"Foo",		"Foo",
	scenePicker =		scenePicker =
	object : SharedElementScenePicker {		object : ElementScenePicker {
	override fun sceneDuringTransition(		override fun sceneDuringTransition(
	element: ElementKey,		element: ElementKey,
	transition: TransitionState.Transition,		transition: TransitionState.Transition,