commit 97bada633929b481bad573643d7e056a11eceead
author Tony Wickham <twickham@google.com> Mon Jun 05 17:52:51 2023 +0000
committer Tony Wickham <twickham@google.com> Mon Jun 05 23:23:40 2023 +0000
tree 530e2374563c1260bd554ea01d40b188ced656e2
parent 0d3edbfeb67f64e4c50f28ac189f05442f0d61ae

Don't allow Taskbar unstash during Assistant gesture

Test: manual with "swipe to invoke assistant" enabled
Flag: none
Fixes: 282060498
Change-Id: I317d01dbbb59d020338b17d424c853a00ef03cce

quickstep/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 1624eb6..d6a468d 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -911,9 +911,9 @@
                 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)