diff --git a/go/quickstep/src/com/android/quickstep/TouchInteractionService.java b/go/quickstep/src/com/android/quickstep/TouchInteractionService.java index 2858deb6f4..35714c04d8 100644 --- a/go/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/go/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -77,6 +77,11 @@ public class TouchInteractionService extends Service { mOverviewCommandHelper.onTip(actionType, viewType); } + @Override + public void onAssistantAvailable(boolean available) { + // TODO handle assistant + } + /** Deprecated methods **/ public void onQuickStep(MotionEvent motionEvent) { } diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar index 2b76924ca6..4b64ad4ade 100644 Binary files a/quickstep/libs/sysui_shared.jar and b/quickstep/libs/sysui_shared.jar differ 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 a3c3ff9655..56432b4bb8 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java @@ -121,6 +121,11 @@ public class TouchInteractionService extends Service { mOverviewCommandHelper.onTip(actionType, viewType); } + @Override + public void onAssistantAvailable(boolean available) { + mAssistantAvailable = available; + } + /** Deprecated methods **/ public void onQuickStep(MotionEvent motionEvent) { } @@ -174,6 +179,7 @@ public class TouchInteractionService extends Service { private TaskOverlayFactory mTaskOverlayFactory; private InputConsumerController mInputConsumer; private SwipeSharedState mSwipeSharedState; + private boolean mAssistantAvailable; private boolean mIsUserUnlocked; private List mOnUserUnlockedCallbacks; @@ -308,7 +314,7 @@ public class TouchInteractionService extends Service { if (runningTaskInfo == null && !mSwipeSharedState.goingToLauncher) { return InputConsumer.NO_OP; - } else if (mOverviewInteractionState.isSwipeUpGestureEnabled() + } else if (mAssistantAvailable && mOverviewInteractionState.isSwipeUpGestureEnabled() && FeatureFlags.ENABLE_ASSISTANT_GESTURE.get() && AssistantTouchConsumer.withinTouchRegion(this, event.getX())) { return new AssistantTouchConsumer(this, mRecentsModel.getSystemUiProxy());