Merge "Add a DefaultElementContentPicker factory for movable elements" into main (a23abe6b) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -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,

+10 −0

Original line number	Diff line number	Diff line
		@@ -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 {
		/**