Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37lineage-17.1

Android 10.0.0 Release 37 (QQ3A.200605.001)

* tag 'android-10.0.0_r37':
  [DO NOT MERGE] Enable APP_SEARCH_IMPROVEMENTS flag.
  Ensure current animation is cancelled before building new folder animation.
  Fixes ag/10573640 on qt-future-dev branch.
  [DO NOT MERGE] Adds basic smart-folder logging.
  [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims
  Import translations. DO NOT MERGE
  Revert "[DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag"
  [DO NOT MERGE] Initiailize APP_SEARCH_IMRPOVEMENT flag outside DEBUG builds.
  [DO NOT MERGE] Adds fling gesture suppression to Launcher
  Dismisses system overlays for Home intent.
  [DO NOT MERGE] Fix some visual jumps when swiping home
  [DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag Bug: 150788630
  [DO NOT MERGE] Prevent hotseat touch hijack

Change-Id: I2316620bda33d83d668c8727e728af09db3e3e4c

1 files changed, 13 insertions, 4 deletions

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index f32182600..2fa789fd6 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -563,9 +563,13 @@ public class TouchInteractionService extends Service implements
                 // not interrupt it. QuickSwitch assumes that interruption can only happen if the
                 // next gesture is also quick switch.
                 mUncheckedConsumer =
-                        new AssistantTouchConsumer(this, mISystemUiProxy,
+                        new AssistantTouchConsumer(
+                                this,
+                                mISystemUiProxy,
                                 mOverviewComponentObserver.getActivityControlHelper(),
-                                InputConsumer.NO_OP, mInputMonitorCompat);
+                                InputConsumer.NO_OP,
+                                mInputMonitorCompat,
+                                mOverviewComponentObserver.assistantGestureIsConstrained());
             } else {
                 mUncheckedConsumer = InputConsumer.NO_OP;
             }
@@ -612,8 +616,13 @@ public class TouchInteractionService extends Service implements
             final ActivityControlHelper activityControl =
                     mOverviewComponentObserver.getActivityControlHelper();
             if (canTriggerAssistantAction(event)) {
-                base = new AssistantTouchConsumer(this, mISystemUiProxy, activityControl, base,
-                        mInputMonitorCompat);
+                base = new AssistantTouchConsumer(
+                        this,
+                        mISystemUiProxy,
+                        activityControl,
+                        base,
+                        mInputMonitorCompat,
+                        mOverviewComponentObserver.assistantGestureIsConstrained());
             }
 
             if ((mSystemUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0) {