From 04d58e841f22901b32ca444c076e1ea169f3bc75 Mon Sep 17 00:00:00 2001 From: Matthew Ng Date: Fri, 1 Mar 2019 15:51:33 -0800 Subject: [PATCH] Do not consume motion events when there is no assistant available Bug: 112934365 Test: manual Change-Id: If9254d974a34772357ce32d5ba2734db5a173f6b --- .../quickstep/TouchInteractionService.java | 5 +++++ quickstep/libs/sysui_shared.jar | Bin 156127 -> 156330 bytes .../quickstep/TouchInteractionService.java | 8 +++++++- 3 files changed, 12 insertions(+), 1 deletion(-) 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 2b76924ca67b9e62ceb2e873dd268332764dcbe4..4b64ad4ade886defa136be622218da218b047426 100644 GIT binary patch delta 8495 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 BSe*a> delta 8174 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 UvcEP|Fz6|8AJvr}`hG 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());