From adea1cb1044709aa8fa793c45d63fb2b59ac4178 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 3 Jan 2023 10:10:02 -0800
Subject: [PATCH] Do not show transient task bar upon swipe up on trackpad

Fixes: 264268943
Test: manual
Change-Id: Ia35ea9eb56fad612a08808724a7b3c4a08a0b6fb
---
 .../quickstep/inputconsumers/TaskbarStashInputConsumer.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java
index 3afd0a3431..385debb157 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java
@@ -17,6 +17,7 @@ package com.android.quickstep.inputconsumers;
 
 import static android.view.MotionEvent.INVALID_POINTER_ID;
 
+import static com.android.launcher3.Utilities.isTrackpadMotionEvent;
 import static com.android.launcher3.Utilities.squaredHypot;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_REVISED_THRESHOLDS;
 import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TOUCHING;
@@ -107,7 +108,8 @@ public class TaskbarStashInputConsumer extends DelegateInputConsumer {
         if (mState != STATE_ACTIVE) {
             mDelegate.onMotionEvent(ev);
 
-            if (mTaskbarActivityContext != null) {
+            // Only show the transient task bar if the touch events are on the screen.
+            if (mTaskbarActivityContext != null && !isTrackpadMotionEvent(ev)) {
                 final float x = ev.getRawX();
                 final float y = ev.getRawY();
                 switch (ev.getAction()) {