diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt index 37015dbb34..914925fd03 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewDismissTouchController.kt @@ -92,6 +92,12 @@ CONTAINER : RecentsViewContainer { false } + // Do not allow dismiss while recents is scrolling. + !recentsView.scroller.isFinished -> { + debugLog(TAG, "Not intercepting touch, recents scrolling.") + false + } + else -> taskViewRecentsTouchContext.isRecentsInteractive.also { isRecentsInteractive -> if (!isRecentsInteractive) { diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt index d4c6c8b18c..6225c47835 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewLaunchTouchController.kt @@ -93,6 +93,12 @@ CONTAINER : RecentsViewContainer { false } + // Do not allow launch while recents is scrolling. + !recentsView.scroller.isFinished -> { + debugLog(TAG, "Not intercepting touch, recents scrolling.") + false + } + else -> taskViewRecentsTouchContext.isRecentsInteractive.also { isRecentsInteractive -> if (!isRecentsInteractive) {