From 97bada633929b481bad573643d7e056a11eceead Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Mon, 5 Jun 2023 17:52:51 +0000 Subject: [PATCH] Don't allow Taskbar unstash during Assistant gesture Test: manual with "swipe to invoke assistant" enabled Flag: none Fixes: 282060498 Change-Id: I317d01dbbb59d020338b17d424c853a00ef03cce --- .../src/com/android/quickstep/TouchInteractionService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index 1624eb63ab..d6a468d39c 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -911,9 +911,9 @@ public class TouchInteractionService extends Service base = tryCreateAssistantInputConsumer(base, newGestureState, event, reasonString); } - // If Taskbar is present, we listen for long press or cursor hover events to unstash it. + // If Taskbar is present, we listen for swipe or cursor hover events to unstash it. TaskbarActivityContext tac = mTaskbarManager.getCurrentActivityContext(); - if (tac != null) { + if (tac != null && !(base instanceof AssistantInputConsumer)) { // Present always on large screen or on small screen w/ flag DeviceProfile dp = tac.getDeviceProfile(); boolean useTaskbarConsumer = dp.isTaskbarPresent && !TaskbarManager.isPhoneMode(dp)