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

Commit 39748f88 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23565985



Change-Id: Ie409a091a427f3b9ca4ef88843b3714c3028b6dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14dda303 e2a6113e

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)