1 files changed, 7 insertions, 25 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
index 50e6c44b6e..ad1306e4cd 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
@@ -8,10 +8,7 @@ import android.animation.ValueAnimator;
 import android.os.Bundle;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.MenuItem;
 import android.view.animation.AccelerateDecelerateInterpolator;
 
 import com.mapbox.mapboxsdk.annotations.Icon;
@@ -42,20 +39,13 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
   private Marker passengerMarker = null;
   private MarkerView carMarker = null;
 
+  private Runnable animationRunnable;
+
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_animated_marker);
 
-    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-    setSupportActionBar(toolbar);
-
-    ActionBar actionBar = getSupportActionBar();
-    if (actionBar != null) {
-      actionBar.setDisplayHomeAsUpEnabled(true);
-      actionBar.setDisplayShowHomeEnabled(true);
-    }
-
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
     mapView.getMapAsync(new OnMapReadyCallback() {
@@ -64,7 +54,8 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
       public void onMapReady(@NonNull final MapboxMap mapboxMap) {
         AnimatedMarkerActivity.this.mapboxMap = mapboxMap;
         setupMap();
-        mapView.post(new Runnable() {
+
+        animationRunnable = new Runnable() {
           @Override
           public void run() {
             for (int i = 0; i < 10; i++) {
@@ -73,7 +64,8 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
             addPassenger();
             addMainCar();
           }
-        });
+        };
+        mapView.post(animationRunnable);
       }
     });
   }
@@ -193,17 +185,6 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
   }
 
   @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case android.R.id.home:
-        onBackPressed();
-        return true;
-      default:
-        return super.onOptionsItemSelected(item);
-    }
-  }
-
-  @Override
   protected void onStart() {
     super.onStart();
     mapView.onStart();
@@ -225,6 +206,7 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
   protected void onStop() {
     super.onStop();
     mapView.onStop();
+    mapView.removeCallbacks(animationRunnable);
   }
 
   @Override