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

Commit 87044762 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:... 

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

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



Change-Id: I26e34597aa96c2eb304ef40404b4492faf7f1074
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4acd0863 39748f88

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -900,9 +900,9 @@ public class TouchInteractionService extends Service 
                base = tryCreateAssistantInputConsumer(base, newGestureState, event, reasonString);

                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();

            TaskbarActivityContext tac = mTaskbarManager.getCurrentActivityContext();

            if (tac != null) {

            if (tac != null && !(base instanceof AssistantInputConsumer)) {

                // Present always on large screen or on small screen w/ flag

                // Present always on large screen or on small screen w/ flag

                DeviceProfile dp = tac.getDeviceProfile();

                DeviceProfile dp = tac.getDeviceProfile();

                boolean useTaskbarConsumer = dp.isTaskbarPresent && !TaskbarManager.isPhoneMode(dp)

                boolean useTaskbarConsumer = dp.isTaskbarPresent && !TaskbarManager.isPhoneMode(dp)