diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt index df10d24d2a..cbb69ba7c7 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashViaTouchController.kt @@ -126,6 +126,14 @@ class TaskbarStashViaTouchController(val controllers: TaskbarControllers) : Touc if (ev.action == MotionEvent.ACTION_OUTSIDE) { controllers.taskbarStashController.updateAndAnimateTransientTaskbar(true) } else if (controllers.taskbarViewController.isEventOverAnyItem(screenCoordinatesEv)) { + // TODO (b/411155437) remove this once BubbleDragController implements TouchController + val bubbleBarDragInProgress = + controllers.bubbleControllers + .map { it.bubbleDragController.isDragging } + .orElse(false) + if (bubbleBarDragInProgress) { + return false + } swipeDownDetector.onTouchEvent(ev) if (swipeDownDetector.isDraggingState) { return true