Merge "Ktfmt on MultiPointerDraggable MultiPointerDraggableTest" into main (0bf3911b) · Commits · e / os / android_frameworks_base

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

+8 −14

Original line number	Diff line number	Diff line
		@@ -200,7 +200,7 @@ internal class MultiPointerDraggableNode(
		override fun onPointerEvent(
		pointerEvent: PointerEvent,
		pass: PointerEventPass,
		bounds: IntSize
		bounds: IntSize,
		) {
		// The order is important here: the tracker is always called first.
		pointerTracker.onPointerEvent(pointerEvent, pass, bounds)
		@@ -312,13 +312,13 @@ internal class MultiPointerDraggableNode(
		velocityTracker.calculateVelocity(maxVelocity)
		}
		.toFloat(),
		onFling = { controller.onStop(it, canChangeContent = true) }
		onFling = { controller.onStop(it, canChangeContent = true) },
		)
		},
		onDragCancel = { controller ->
		startFlingGesture(
		initialVelocity = 0f,
		onFling = { controller.onStop(it, canChangeContent = true) }
		onFling = { controller.onStop(it, canChangeContent = true) },
		)
		},
		swipeDetector = swipeDetector,
		@@ -369,10 +369,7 @@ internal class MultiPointerDraggableNode(
		// PreScroll phase
		val consumedByPreScroll =
		dispatcher
		.dispatchPreScroll(
		available = availableOnPreScroll.toOffset(),
		source = source,
		)
		.dispatchPreScroll(available = availableOnPreScroll.toOffset(), source = source)
		.toFloat()

		// Scroll phase
		@@ -484,12 +481,12 @@ internal class MultiPointerDraggableNode(
		Orientation.Horizontal ->
		awaitHorizontalTouchSlopOrCancellation(
		consumablePointer.id,
		onSlopReached
		onSlopReached,
		)
		Orientation.Vertical ->
		awaitVerticalTouchSlopOrCancellation(
		consumablePointer.id,
		onSlopReached
		onSlopReached,
		)
		}

		@@ -553,7 +550,7 @@ internal class MultiPointerDraggableNode(
		}

		private suspend fun AwaitPointerEventScope.awaitConsumableEvent(
		pass: () -> PointerEventPass,
		pass: () -> PointerEventPass
		): PointerEvent {
		fun canBeConsumed(changes: List<PointerInputChange>): Boolean {
		// At least one pointer down AND
		@@ -661,7 +658,4 @@ internal fun interface PointersInfoOwner {
		fun pointersInfo(): PointersInfo
		}

		internal data class PointersInfo(
		val startedPosition: Offset?,
		val pointersDown: Int,
		)
		internal data class PointersInfo(val startedPosition: Offset?, val pointersDown: Int)

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ class MultiPointerDraggableTest {
		it
		}
		),
		Orientation.Vertical
		Orientation.Vertical,
		)
		.fillMaxSize()
		)
		@@ -640,7 +640,7 @@ class MultiPointerDraggableTest {
		override fun onPostScroll(
		consumed: Offset,
		available: Offset,
		source: NestedScrollSource
		source: NestedScrollSource,
		): Offset {
		availableOnPostScroll = available.y
		return Offset.Zero
		@@ -653,7 +653,7 @@ class MultiPointerDraggableTest {

		override suspend fun onPostFling(
		consumed: Velocity,
		available: Velocity
		available: Velocity,
		): Velocity {
		availableOnPostFling = available.y
		return Velocity.Zero