Merge "Prevent launcher gestures when back/assistant have activated"

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());

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);