Merge heads

MyTracks/src/com/google/android/apps/mytracks/maps/DynamicSpeedTrackPathDescriptor.java

@@ -129,6 +129,14 @@ public class DynamicSpeedTrackPathDescriptor implements TrackPathDescriptor {
   int getSpeedMargin() {
     return speedMargin;
   }
+  
+  /**
+   * Sets the speed margin.
+   */
+  @VisibleForTesting
+  void setSpeedMargin(int value) {
+    speedMargin = value;
+  }
 
   /**
    * Gets the average moving speed.

MyTracks/src/com/google/android/apps/mytracks/maps/MultiColorTrackPath.java

@@ -20,6 +20,7 @@ import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Polyline;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;
 
 import android.content.Context;
 
@@ -102,7 +103,8 @@ public class MultiColorTrackPath implements TrackPath {
     TrackPathUtils.addPath(googleMap, paths, lastSegmentPoints, lastSegmentColor, useLastPolyline);
   }
 
-  private int getColor(int speed) {
+  @VisibleForTesting
+  protected int getColor(int speed) {
     if (speed <= trackPathDescriptor.getSlowSpeed()) {
       return slowColor;
     } else if (speed <= trackPathDescriptor.getNormalSpeed()) {
@@ -111,4 +113,16 @@ public class MultiColorTrackPath implements TrackPath {
       return fastColor;
     }
   }
+  
+  public int getSlowColor() {
+    return slowColor;
+  }
+
+  public int getNormalColor() {
+    return normalColor;
+  }
+
+  public int getFastColor() {
+    return fastColor;
+  }
 }