commit 42e80788c5cf03dfac25affe895e5a0302995a67
author Tracy Zhou <tracyzhou@google.com> Wed Jan 04 23:03:20 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 04 23:03:20 2023 +0000
tree c577a675cff4b612eaa70201e9595cc31a8afd9f
parent f12179232bd914ee9a4c3ba925d559fc86989ba7
parent adea1cb1044709aa8fa793c45d63fb2b59ac4178

Merge "Do not show transient task bar upon swipe up on trackpad"

quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java
index 3afd0a3..385debb 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/TaskbarStashInputConsumer.java
@@ -17,6 +17,7 @@
 
 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 @@
         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()) {