openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not consume motion events when there is no assistant available 

Bug: 112934365
Test: manual
Change-Id: If9254d974a34772357ce32d5ba2734db5a173f6b
This commit is contained in:
Matthew Ng 2019-03-01 15:51:33 -08:00
parent 40e0693234
commit 04d58e841f
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
go/quickstep/src/com/android/quickstep/TouchInteractionService.java
View File

@ -77,6 +77,11 @@ public class TouchInteractionService extends Service {
mOverviewCommandHelper.onTip(actionType, viewType); mOverviewCommandHelper.onTip(actionType, viewType);
} }
@Override
public void onAssistantAvailable(boolean available) {
// TODO handle assistant
}
/** Deprecated methods **/ /** Deprecated methods **/
public void onQuickStep(MotionEvent motionEvent) { } public void onQuickStep(MotionEvent motionEvent) { }

BIN
quickstep/libs/sysui_shared.jar
View File

Binary file not shown.

8
quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
View File

@ -121,6 +121,11 @@ public class TouchInteractionService extends Service {
mOverviewCommandHelper.onTip(actionType, viewType); mOverviewCommandHelper.onTip(actionType, viewType);
} }
@Override
public void onAssistantAvailable(boolean available) {
mAssistantAvailable = available;
}
/** Deprecated methods **/ /** Deprecated methods **/
public void onQuickStep(MotionEvent motionEvent) { } public void onQuickStep(MotionEvent motionEvent) { }
@ -174,6 +179,7 @@ public class TouchInteractionService extends Service {
private TaskOverlayFactory mTaskOverlayFactory; private TaskOverlayFactory mTaskOverlayFactory;
private InputConsumerController mInputConsumer; private InputConsumerController mInputConsumer;
private SwipeSharedState mSwipeSharedState; private SwipeSharedState mSwipeSharedState;
private boolean mAssistantAvailable;
private boolean mIsUserUnlocked; private boolean mIsUserUnlocked;
private List<Runnable> mOnUserUnlockedCallbacks; private List<Runnable> mOnUserUnlockedCallbacks;
@ -308,7 +314,7 @@ public class TouchInteractionService extends Service {
if (runningTaskInfo == null && !mSwipeSharedState.goingToLauncher) { if (runningTaskInfo == null && !mSwipeSharedState.goingToLauncher) {
return InputConsumer.NO_OP; return InputConsumer.NO_OP;
} else if (mOverviewInteractionState.isSwipeUpGestureEnabled() } else if (mAssistantAvailable && mOverviewInteractionState.isSwipeUpGestureEnabled()
&& FeatureFlags.ENABLE_ASSISTANT_GESTURE.get() && FeatureFlags.ENABLE_ASSISTANT_GESTURE.get()
&& AssistantTouchConsumer.withinTouchRegion(this, event.getX())) { && AssistantTouchConsumer.withinTouchRegion(this, event.getX())) {
return new AssistantTouchConsumer(this, mRecentsModel.getSystemUiProxy()); return new AssistantTouchConsumer(this, mRecentsModel.getSystemUiProxy());