Merge "Cancel transition when pointer input is cancelled" into main (10018f0b) · Commits · e / os / android_frameworks_base

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

+21 −14

Original line number	Diff line number	Diff line
		@@ -283,9 +283,12 @@ private suspend fun PointerInputScope.detectDragGestures(
		}

		onDragStart(drag.position, overSlop, pressed.size)

		val successful: Boolean
		try {
		onDrag(drag, overSlop)

		val successful =
		successful =
		when (orientation) {
		Orientation.Horizontal ->
		horizontalDrag(drag.id) {
		@@ -298,6 +301,10 @@ private suspend fun PointerInputScope.detectDragGestures(
		it.consume()
		}
		}
		} catch (t: Throwable) {
		onDragCancel()
		throw t
		}

		if (successful) {
		onDragEnd()

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

0 → 100644

+104 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.compose.animation.scene

		import androidx.compose.foundation.gestures.Orientation
		import androidx.compose.foundation.layout.Box
		import androidx.compose.foundation.layout.size
		import androidx.compose.runtime.getValue
		import androidx.compose.runtime.mutableStateOf
		import androidx.compose.runtime.setValue
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.geometry.Offset
		import androidx.compose.ui.geometry.Size
		import androidx.compose.ui.platform.LocalDensity
		import androidx.compose.ui.platform.LocalViewConfiguration
		import androidx.compose.ui.test.junit4.createComposeRule
		import androidx.compose.ui.test.onRoot
		import androidx.compose.ui.test.performTouchInput
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import com.google.common.truth.Truth.assertThat
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith

		@RunWith(AndroidJUnit4::class)
		class MultiPointerDraggableTest {
		@get:Rule val rule = createComposeRule()

		@Test
		fun cancellingPointerCallsOnDragStopped() {
		val size = 200f
		val middle = Offset(size / 2f, size / 2f)

		var enabled by mutableStateOf(false)
		var started = false
		var dragged = false
		var stopped = false

		var touchSlop = 0f
		rule.setContent {
		touchSlop = LocalViewConfiguration.current.touchSlop
		Box(
		Modifier.size(with(LocalDensity.current) { Size(size, size).toDpSize() })
		.multiPointerDraggable(
		orientation = Orientation.Vertical,
		enabled = { enabled },
		startDragImmediately = { false },
		onDragStarted = { _, _, _ -> started = true },
		onDragDelta = { _ -> dragged = true },
		onDragStopped = { stopped = true },
		)
		)
		}

		fun startDraggingDown() {
		rule.onRoot().performTouchInput {
		down(middle)
		moveBy(Offset(0f, touchSlop))
		}
		}

		fun releaseFinger() {
		rule.onRoot().performTouchInput { up() }
		}

		// Swiping down does nothing because enabled is false.
		startDraggingDown()
		assertThat(started).isFalse()
		assertThat(dragged).isFalse()
		assertThat(stopped).isFalse()
		releaseFinger()

		// Enable the draggable and swipe down. This should both call onDragStarted() and
		// onDragDelta().
		enabled = true
		rule.waitForIdle()
		startDraggingDown()
		assertThat(started).isTrue()
		assertThat(dragged).isTrue()
		assertThat(stopped).isFalse()

		// Disable the pointer input. This should call onDragStopped() even if didn't release the
		// finger yet.
		enabled = false
		rule.waitForIdle()
		assertThat(started).isTrue()
		assertThat(dragged).isTrue()
		assertThat(stopped).isTrue()
		}
		}