Rename SharedElementScenePicker to ElementScenePicker (1/2)
Bug: 291071158
Test: N/A. Pure renaming.
Flag: N/A
Change-Id: I4bc599ce1c636e30a78ba5a25eac98216116af5a
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
index feafc19..ae28d0a 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Element.kt
@@ -291,7 +291,7 @@
scene: SceneKey,
element: ElementKey,
): Boolean {
- val scenePicker = element.scenePicker ?: DefaultSharedElementScenePicker
+ val scenePicker = element.scenePicker ?: DefaultElementScenePicker
val fromScene = transition.fromScene
val toScene = transition.toScene
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt
index fecd7f3..dc1ddb6 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt
@@ -70,10 +70,10 @@
val isBackground: Boolean = false,
/**
- * The [SharedElementScenePicker] to use when deciding in which scene we should draw or compose
- * this element when it is shared.
+ * The [ElementScenePicker] to use when deciding in which scene we should draw or compose this
+ * element when it is shared.
*/
- val scenePicker: SharedElementScenePicker? = null,
+ val scenePicker: ElementScenePicker? = null,
) : Key(name, identity), ElementMatcher {
@VisibleForTesting
// TODO(b/240432457): Make internal once PlatformComposeSceneTransitionLayoutTestsUtils can
diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDsl.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDsl.kt
index f0e19e0..1ae21cc 100644
--- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDsl.kt
+++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDsl.kt
@@ -130,7 +130,7 @@
fun reversed(builder: TransitionBuilder.() -> Unit)
}
-interface SharedElementScenePicker {
+interface ElementScenePicker {
/**
* Return the scene in which [element] should be drawn (when using `Modifier.element(key)`) or
* composed (when using `MovableElement(key)`) during the given [transition].
@@ -183,7 +183,7 @@
}
}
-object DefaultSharedElementScenePicker : SharedElementScenePicker {
+object DefaultElementScenePicker : ElementScenePicker {
override fun sceneDuringTransition(
element: ElementKey,
transition: TransitionState.Transition,
diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MovableElementTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MovableElementTest.kt
index 3253289..35cb691 100644
--- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MovableElementTest.kt
+++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/MovableElementTest.kt
@@ -151,7 +151,7 @@
ElementKey(
"Foo",
scenePicker =
- object : SharedElementScenePicker {
+ object : ElementScenePicker {
override fun sceneDuringTransition(
element: ElementKey,
transition: TransitionState.Transition,