summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/Key.kt1
-rw-r--r--packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/TransitionDsl.kt10
2 files changed, 11 insertions, 0 deletions
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 3cd5553bc963..acb436e4874b 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
@@ -107,6 +107,7 @@ class MovableElementKey(
* The [StaticElementContentPicker] to use when deciding in which scene we should draw shared
* Elements or compose MovableElements.
*
+ * @see DefaultElementContentPicker
* @see MovableElementContentPicker
*/
override val contentPicker: StaticElementContentPicker,
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 38b83835ad29..a30b78049213 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
@@ -305,6 +305,11 @@ interface ElementContentPicker {
* An element picker on which we can query the set of contents (scenes or overlays) that contain the
* element. This is needed by [MovableElement], that needs to know at composition time on which of
* the candidate contents an element should be composed.
+ *
+ * @see DefaultElementContentPicker(contents)
+ * @see HighestZIndexContentPicker(contents)
+ * @see LowestZIndexContentPicker(contents)
+ * @see MovableElementContentPicker
*/
interface StaticElementContentPicker : ElementContentPicker {
/** The exhaustive lists of contents that contain this element. */
@@ -434,6 +439,11 @@ class MovableElementContentPicker(
/** The default [ElementContentPicker]. */
val DefaultElementContentPicker = HighestZIndexContentPicker
+/** The [DefaultElementContentPicker] that can be used for [MovableElement]s. */
+fun DefaultElementContentPicker(contents: Set<ContentKey>): StaticElementContentPicker {
+ return HighestZIndexContentPicker(contents)
+}
+
@TransitionDsl
interface PropertyTransformationBuilder {
/**