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

Commit e2a6113e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't allow Taskbar unstash during Assistant gesture" into udc-dev

parents 51962097 97bada63

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)