[android] save location animation timestamp only when fed

When all location layer animations were reset, due to the mode change, we were recalculating the time of the animation, while we should be taking the remaining duration. Frequent recalculation requests resulted in a really short animation duration.

1 files changed, 20 insertions, 20 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java
index 6337287770..5aad038a28 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinator.java
@@ -94,8 +94,23 @@ final class LocationAnimatorCoordinator {
 
     boolean snap = immediateAnimation(projection, previousCameraLatLng, targetLatLng)
       || immediateAnimation(projection, previousLayerLatLng, targetLatLng);
-    playAnimators(
-      snap ? 0 : getAnimationDuration(),
+
+    long animationDuration = 0;
+    if (!snap) {
+      long previousUpdateTimeStamp = locationUpdateTimestamp;
+      locationUpdateTimestamp = SystemClock.elapsedRealtime();
+
+      if (previousUpdateTimeStamp == 0) {
+        animationDuration = 0;
+      } else {
+        animationDuration = (long) ((locationUpdateTimestamp - previousUpdateTimeStamp) * durationMultiplier)
+        /* make animation slightly longer with durationMultiplier, defaults to 1.1f */;
+      }
+
+      animationDuration = Math.min(animationDuration, MAX_ANIMATION_DURATION_MS);
+    }
+
+    playAnimators(animationDuration,
       ANIMATOR_LAYER_LATLNG,
       ANIMATOR_LAYER_GPS_BEARING,
       ANIMATOR_CAMERA_LATLNG,
@@ -259,23 +274,6 @@ final class LocationAnimatorCoordinator {
     }
   }
 
-  private long getAnimationDuration() {
-    long previousUpdateTimeStamp = locationUpdateTimestamp;
-    locationUpdateTimestamp = SystemClock.elapsedRealtime();
-
-    long animationDuration;
-    if (previousUpdateTimeStamp == 0) {
-      animationDuration = 0;
-    } else {
-      animationDuration = (long) ((locationUpdateTimestamp - previousUpdateTimeStamp) * durationMultiplier)
-      /* make animation slightly longer with durationMultiplier, defaults to 1.1f */;
-    }
-
-    animationDuration = Math.min(animationDuration, MAX_ANIMATION_DURATION_MS);
-
-    return animationDuration;
-  }
-
   private float checkGpsNorth(boolean isGpsNorth, float targetCameraBearing) {
     if (isGpsNorth) {
       targetCameraBearing = 0;
@@ -362,7 +360,9 @@ final class LocationAnimatorCoordinator {
       float currentGpsBearingTarget = gpsBearingAnimator.getTarget();
       createNewFloatAnimator(ANIMATOR_LAYER_GPS_BEARING, currentGpsBearing, currentGpsBearingTarget);
 
-      playAnimators(getAnimationDuration(), ANIMATOR_LAYER_LATLNG, ANIMATOR_LAYER_GPS_BEARING);
+      long duration = latLngAnimator.getDuration() - latLngAnimator.getCurrentPlayTime();
+
+      playAnimators(duration, ANIMATOR_LAYER_LATLNG, ANIMATOR_LAYER_GPS_BEARING);
     }
 
     if (compassBearingAnimator != null) {