Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97bada63 authored by Tony Wickham's avatar Tony Wickham
Browse files

Don't allow Taskbar unstash during Assistant gesture 

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

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

+2 −2
Original line number Diff line number Diff line
@@ -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)