diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
index 2151de5fc..976c55f4d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
@@ -109,8 +109,19 @@ public class TrackingSettings {
      * Set the dismissal of the tracking modes if a gesture occurs.
      *
      * @param dismissTrackingOnGesture True to dismiss the tracking modes.
+     * @deprecated use @link #setDismissAllTrackingOnGesture instead
      */
+    @Deprecated
     public void setDismissTrackingOnGesture(boolean dismissTrackingOnGesture) {
+        setDismissAllTrackingOnGesture(dismissTrackingOnGesture);
+    }
+
+    /**
+     * Set the dismissal of the tracking modes if a gesture occurs.
+     *
+     * @param dismissTrackingOnGesture True to dismiss the tracking modes.
+     */
+    public void setDismissAllTrackingOnGesture(boolean dismissTrackingOnGesture) {
         dismissLocationTrackingOnGesture = dismissTrackingOnGesture;
         dismissBearingTrackingOnGesture = dismissTrackingOnGesture;
         validateGesturesForTrackingModes();
@@ -171,7 +182,7 @@ public class TrackingSettings {
      *
      * @return True if location tracking is disabled.
      */
-    public boolean isLocationTrackingDisabled(){
+    public boolean isLocationTrackingDisabled() {
         return myLocationTrackingMode == MyLocationTracking.TRACKING_NONE;
     }
 }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
index 52f20b066..bb0af51de 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
@@ -57,8 +57,9 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
             public void onMapReady(@NonNull MapboxMap mapboxMap) {
                 mMapboxMap = mapboxMap;
 
-                MyLocationViewSettings locationViewSettings = mapboxMap.getMyLocationViewSettings();
-                locationViewSettings.setPadding(0, (int) getResources().getDimension(R.dimen.locationview_padding_top), 0, 0);
+                // disable dismissal when a gesture occurs
+                mMapboxMap.getTrackingSettings().setDismissTrackingOnGesture(false);
+                mMapboxMap.getTrackingSettings().setDismissBearingTrackingOnGesture(false);
 
                 mapboxMap.setOnMyLocationChangeListener(MyLocationTrackingModeActivity.this);
 
@@ -209,16 +210,22 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        boolean state;
         switch (item.getItemId()) {
             case android.R.id.home:
                 onBackPressed();
                 return true;
             case R.id.action_toggle_dismissible_tracking:
-                boolean state = !item.isChecked();
-                mMapboxMap.getTrackingSettings().setDismissTrackingOnGesture(state);
+                state = !item.isChecked();
+                mMapboxMap.getTrackingSettings().setDismissLocationTrackingOnGesture(state);
                 Toast.makeText(this, "Dismiss tracking mode on gesture = " + state, Toast.LENGTH_SHORT).show();
                 item.setChecked(state);
                 return true;
+            case R.id.action_toggle_dismissible_bearing:
+                state = !item.isChecked();
+                mMapboxMap.getTrackingSettings().setDismissBearingTrackingOnGesture(state);
+                Toast.makeText(this, "Dismiss bearing mode on gesture = " + state, Toast.LENGTH_SHORT).show();
+                item.setChecked(state);
             default:
                 return super.onOptionsItemSelected(item);
         }
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml
index 25c77fcc2..dc2add474 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_tracking.xml
@@ -6,9 +6,15 @@
         <item
             android:id="@+id/action_toggle_dismissible_tracking"
             android:checkable="true"
-            android:checked="true"
+            android:checked="false"
             android:title="@string/menuitem_title_tracking_mode_dismiss_on_gesture"
             app:showAsAction="never" />
+        <item
+            android:id="@+id/action_toggle_dismissible_bearing"
+            android:checkable="true"
+            android:checked="false"
+            android:title="@string/menuitem_title_bearing_mode_dismiss_on_gesture"
+            app:showAsAction="never" />
     </group>
 
 </menu>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index 28e5a824f..3d7de0704 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -73,7 +73,8 @@
     <string name="description_doublemap">2 maps in a view hierarchy</string>
 
     <string name="menuitem_title_concurrent_infowindow">Concurrent Open InfoWindows</string>r
-    <string name="menuitem_title_tracking_mode_dismiss_on_gesture">Dismiss on Gesture</string>r
+    <string name="menuitem_title_tracking_mode_dismiss_on_gesture">Dismiss location tracking on gesture</string>
+    <string name="menuitem_title_bearing_mode_dismiss_on_gesture">Dismiss bearing tracking on gesture</string>
 
     <string name="category">category</string>
     <string name="category_annotation">Annotation</string>