commit 9b97217ffb99f06ae668cdce63edc329ee733000
author Winson Chung <winsonc@google.com> Thu Nov 02 22:46:23 2023 +0000
committer Winson Chung <winsonc@google.com> Thu Nov 02 22:46:23 2023 +0000
tree f55de17c71ba47d26f4c566072e19ce241772bcf
parent 8a01ea889f0e1611dea2d7bf56c0d65db198cf7d

Handle long press directly if recents transition is deferred

- For 3p launchers, the starting of the home activity is deferred until
  the user moves past a slop, in these cases we don't need to worry
  about finishing the recents transition before handling long press
  (since it was never started)

Fixes: 307254136
Test: Enable 3p launcher and invoke omni
Change-Id: I0aed7e7d442e010c38979e3f806f6cf0eb33cfe8

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

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java
index 32f7bd5..efa84d3 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java
@@ -114,7 +114,7 @@
         if (longPressRunnable != null) {
             OtherActivityInputConsumer oaic = getInputConsumerOfClass(
                     OtherActivityInputConsumer.class);
-            if (oaic != null) {
+            if (oaic != null && oaic.hasStartedTouchTracking()) {
                 oaic.setForceFinishRecentsTransitionCallback(longPressRunnable);
                 setActive(mCurrentDownEvent);
             } else {

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

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
index e724547..eedd204 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java
@@ -413,6 +413,14 @@
     }
 
     /**
+     * Returns whether this input consumer has started touch tracking (if touch tracking is not
+     * deferred).
+     */
+    public boolean hasStartedTouchTracking() {
+        return mInteractionHandler != null;
+    }
+
+    /**
      * Called when the gesture has ended. Does not correlate to the completion of the interaction as
      * the animation can still be running.
      */