merge heads

MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java

@@ -87,9 +87,9 @@ public class CsvTrackWriter implements TrackFormatWriter {
 
   @Override
   public void writeHeader() {
-    writeCommaSeparatedLine(context.getString(R.string.track_detail_track_name),
-        context.getString(R.string.track_detail_activity_type_hint),
-        context.getString(R.string.track_detail_track_description));
+    writeCommaSeparatedLine(context.getString(R.string.track_edit_name),
+        context.getString(R.string.track_edit_activity_type_hint),
+        context.getString(R.string.track_edit_description));
     writeCommaSeparatedLine(track.getName(), track.getCategory(), track.getDescription());
     writeCommaSeparatedLine();
   }

MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java

@@ -21,6 +21,7 @@ import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesUtils;
 import com.google.android.apps.mytracks.io.maps.SendMapsUtils;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -48,6 +49,7 @@ public class UploadResultActivity extends Activity {
   private SendRequest sendRequest;
   private Track track;
   private String shareUrl;
+  private Dialog dialog;
   
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -167,7 +169,8 @@ public class UploadResultActivity extends Activity {
             }
           });
     }
-    return builder.create();
+    dialog = builder.create();
+    return dialog;
   }
 
   /**
@@ -186,4 +189,9 @@ public class UploadResultActivity extends Activity {
         shareUrlOnly ? url : getString(R.string.share_track_url_body_format, url));
     startActivity(Intent.createChooser(intent, getString(R.string.share_track_picker_title)));
   }
+  
+  @VisibleForTesting
+  Dialog getDialog() {
+    return dialog;
+  }
 }

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

@@ -20,6 +20,7 @@ import com.google.android.apps.mytracks.MapOverlay.CachedLocation;
 import com.google.android.maps.GeoPoint;
 import com.google.android.maps.Projection;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -138,4 +139,14 @@ public class  DynamicSpeedTrackPathPainter implements TrackPathPainter {
     }
     return path;
   }
+  
+  /**
+   * Returns coloredPaths.
+   * 
+   * @return coloredPaths
+   */
+  @VisibleForTesting
+  List<ColoredPath> getColoredPaths() {
+    return coloredPaths;
+  }
 }

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

@@ -19,6 +19,7 @@ import com.google.android.apps.mytracks.MapOverlay.CachedLocation;
 import com.google.android.maps.GeoPoint;
 import com.google.android.maps.Projection;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -29,16 +30,15 @@ import android.graphics.Rect;
 
 import java.util.List;
 
-
 /**
  * A path painter that not variates the path colors.
- *
- *  @author Vangelis S.
+ * 
+ * @author Vangelis S.
  */
 public class SingleColorTrackPathPainter implements TrackPathPainter {
   private final Paint selectedTrackPaint;
   private Path path;
-  
+
   public SingleColorTrackPathPainter(Context context) {
     selectedTrackPaint = TrackPathUtilities.getPaint(R.color.red, context);
   }
@@ -47,49 +47,64 @@ public class SingleColorTrackPathPainter implements TrackPathPainter {
   public void drawTrack(Canvas canvas) {
     canvas.drawPath(path, selectedTrackPaint);
   }
-  
+
   @Override
   public void updatePath(Projection projection, Rect viewRect, int startLocationIdx,
       Boolean alwaysVisible, List<CachedLocation> points) {
+    path = new Path();
+    updatePath(projection, viewRect, startLocationIdx, alwaysVisible, points, path);
+
+  }
+
+  /**
+   * Updates the path.
+   * 
+   * @param projection The Canvas to draw upon.
+   * @param viewRect The Path to be drawn.
+   * @param startLocationIdx The start point from where update the path.
+   * @param alwaysVisible Flag for always visible.
+   * @param points The list of points used to update the path.
+   * @param pathToUpdate The path to be created.
+   */
+  @VisibleForTesting
+  void updatePath(Projection projection, Rect viewRect, int startLocationIdx,
+      Boolean alwaysVisible, List<CachedLocation> points, Path pathToUpdate) {
+    pathToUpdate.incReserve(points.size());
     // Whether to start a new segment on new valid and visible point.
-    boolean newSegment = startLocationIdx <= 0 || !points.get(startLocationIdx - 1).valid; 
+    boolean newSegment = startLocationIdx <= 0 || !points.get(startLocationIdx - 1).valid;
     boolean lastVisible = !newSegment;
     final Point pt = new Point();
     // Loop over track points.
-    int numPoints = points.size();
-    path = newPath();
-    path.incReserve(numPoints);
-    
-    for (int i = startLocationIdx; i < numPoints ; ++i) {
+    for (int i = startLocationIdx; i < points.size(); ++i) {
       CachedLocation loc = points.get(i);
-      
+
       // Check if valid, if not then indicate a new segment.
       if (!loc.valid) {
         newSegment = true;
         continue;
       }
-      
+
       final GeoPoint geoPoint = loc.geoPoint;
       // Check if this breaks the existing segment.
-      boolean visible = alwaysVisible 
+      boolean visible = alwaysVisible
           || viewRect.contains(geoPoint.getLongitudeE6(), geoPoint.getLatitudeE6());
       if (!visible && !lastVisible) {
         // This is a point outside view not connected to a visible one.
         newSegment = true;
       }
       lastVisible = visible;
-      
+
       // Either move to beginning of a new segment or continue the old one.
       projection.toPixels(geoPoint, pt);
       if (newSegment) {
-        path.moveTo(pt.x, pt.y);
+        pathToUpdate.moveTo(pt.x, pt.y);
         newSegment = false;
       } else {
-        path.lineTo(pt.x, pt.y);
+        pathToUpdate.lineTo(pt.x, pt.y);
       }
     }
   }
-  
+
   @Override
   public void clear() {
     path = null;
@@ -99,12 +114,12 @@ public class SingleColorTrackPathPainter implements TrackPathPainter {
   public boolean needsRedraw() {
     return false;
   }
-  
+
   @Override
   public Path getLastPath() {
     return path;
   }
-  
+
   // Visible for testing
   public Path newPath() {
     return new Path();