1 files changed, 25 insertions, 7 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index a245c283bd..02264cace0 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -1917,17 +1917,25 @@ public final class MapboxMap {
   }
 
   /**
-   * Sets a custom {@link AndroidGesturesManager} to handle {@link android.view.MotionEvent}s registered by the map.
-   *
-   * @param androidGesturesManager Gestures manager that interprets gestures based on the motion events.
+   * Sets a custom {@link AndroidGesturesManager} to handle {@link android.view.MotionEvent}s
+   * registered by the {@link MapView}.
+   *
+   * @param androidGesturesManager       Gestures manager that interprets gestures based on the motion events.
+   * @param attachDefaultListeners       If true, pre-defined listeners will be attach
+   *                                     to change map based on {@link AndroidGesturesManager} callbacks.
+   * @param setDefaultMutuallyExclusives If true, pre-defined mutually exclusive gesture sets
+   *                                     will be added to the passed gestures manager.
    * @see <a href="https://github.com/mapbox/mapbox-gestures-android">mapbox-gestures-android library</a>
    */
-  public void setGesturesManager(AndroidGesturesManager androidGesturesManager) {
-    onGesturesManagerInteractionListener.setGesturesManager(androidGesturesManager);
+  public void setGesturesManager(AndroidGesturesManager androidGesturesManager, boolean attachDefaultListeners,
+                                 boolean setDefaultMutuallyExclusives) {
+    onGesturesManagerInteractionListener.setGesturesManager(
+      androidGesturesManager, attachDefaultListeners, setDefaultMutuallyExclusives);
   }
 
   /**
-   * Get current {@link AndroidGesturesManager} that handles {@link android.view.MotionEvent}s registered by the map.
+   * Get current {@link AndroidGesturesManager} that handles {@link android.view.MotionEvent}s
+   * registered by the {@link MapView}
    *
    * @return Current gestures manager.
    */
@@ -1936,6 +1944,13 @@ public final class MapboxMap {
   }
 
   /**
+   * Interrupts any ongoing gesture velocity animations.
+   */
+  public void cancelAllVelocityAnimations() {
+    onGesturesManagerInteractionListener.cancelAllVelocityAnimations();
+  }
+
+  /**
    * Sets a callback that's invoked when the user clicks on the map view.
    *
    * @param listener The callback that's invoked when the user clicks on the map view.
@@ -2352,7 +2367,10 @@ public final class MapboxMap {
 
     AndroidGesturesManager getGesturesManager();
 
-    void setGesturesManager(AndroidGesturesManager gesturesManager);
+    void setGesturesManager(AndroidGesturesManager gesturesManager, boolean attachDefaultListeners,
+                            boolean setDefaultMutuallyExclusives);
+
+    void cancelAllVelocityAnimations();
   }
 
   /**