From af7fc1503bbb8f8ba4b66a95fde1b43665c1ab16 Mon Sep 17 00:00:00 2001 From: Matthew Ng Date: Tue, 15 Jan 2019 16:44:23 -0800 Subject: Prevent launcher gestures when back/assistant have activated Do not proxy anymore motion events after back or assistant has started so that the launcher does not try to execute quick step if the user swipes a gesture followed by swiping up. Test: manual Bug: 112934365 Change-Id: I6711b52e7870193051afd38704fa0be86ad242b8 --- .../android/systemui/statusbar/phone/NavigationAssistantAction.java | 5 +++++ .../com/android/systemui/statusbar/phone/NavigationBackAction.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationAssistantAction.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationAssistantAction.java index ebcd39b99778..323e7761b475 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationAssistantAction.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationAssistantAction.java @@ -42,6 +42,11 @@ public class NavigationAssistantAction extends NavigationGestureAction { return true; } + @Override + public boolean disableProxyEvents() { + return true; + } + @Override public void onGestureStart(MotionEvent event) { mAssistManager.startAssist(new Bundle()); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBackAction.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBackAction.java index 93605adf4589..7a42b03947ae 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBackAction.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBackAction.java @@ -95,6 +95,11 @@ public class NavigationBackAction extends NavigationGestureAction { } } + @Override + public boolean disableProxyEvents() { + return true; + } + private void performBack() { sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK); sendEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK); -- cgit v1.2.3-59-g8ed1b