Merge Heads

MyTracks/res/values/strings.xml

@@ -2596,13 +2596,53 @@ limitations under the License.
       Screenshot: value_auto_resume.png">
     Always
   </string>
-  <string name="value_float_mile"
+  <string name="value_float_feet"
-    translation_description="In a setting picker, the string format to display a float value in
+    translation_description="Display a float value in feet (ft).
-      miles (mi).
 
-      %1$.1f: a float number. E.g., '2.2'
+      %1$.2f: a float number. E.g., '2.22'">
-      Screenshot: value_gps_accuracy_mile_poor_gps.png">
+    %1$.2f ft
-    %1$.1f mi
+  </string>
+  <string name="value_float_kilometer"
+    translation_description="Display a float value in kilometers (km).
+
+      %1$.2f: a float number. E.g., '2.22'">
+    %1$.2f km
+  </string>
+    <string name="value_float_kilometer_hour"
+    translation_description="Display a float value in kilometers per hour (km/h).
+
+      %1$.2f: a float number. E.g., '2.22'">
+    %1$.2f km/h
+  </string>
+  <string name="value_float_meter"
+    translation_description="Display a float value in meters (m).
+
+      %1$.2f: a float number. E.g., '2.22'">
+    %1$.2f m
+  </string>
+  <string name="value_float_mile"
+    translation_description="Display a float value in miles (mi).
+
+      %1$.2f: a float number. E.g., '2.22'">
+    %1$.2f mi
+  </string>
+  <string name="value_float_mile_hour"
+    translation_description="Display a float value in miles per hour (mi/h).
+
+      %1$.2f: a float number. E.g., '2.22'">
+    %1$.2f mi/h
+  </string>
+  <string name="value_float_minute_kilometer"
+    translation_description="Display a float value in minutes per kilometer (min/km).
+
+      %1$.2f: a float number. E.g., '2.22'">
+    %1$.2f min/km
+  </string>
+  <string name="value_float_minute_mile"
+    translation_description="Display a float value in minutes per mile (min/mi).
+
+      %1$.2f: a float number. E.g., '2.22'">
+    %1$.2f min/mi
   </string>
   <string name="value_float_mile_poor_gps"
     translation_description="In a setting picker, the string format to display a float value in

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

@@ -17,7 +17,6 @@ package com.google.android.apps.mytracks;
 
 import static com.google.android.apps.mytracks.Constants.TAG;
 
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.TracksColumns;
@@ -27,6 +26,7 @@ import com.google.android.apps.mytracks.content.WaypointsColumns;
 import com.google.android.apps.mytracks.services.ITrackRecordingService;
 import com.google.android.apps.mytracks.services.ServiceUtils;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
+import com.google.android.apps.mytracks.util.AnalyticsUtils;
 import com.google.android.apps.mytracks.util.ApiAdapterFactory;
 import com.google.android.apps.mytracks.util.EulaUtils;
 import com.google.android.apps.mytracks.util.SystemUtils;
@@ -92,11 +92,6 @@ public class MyTracks extends TabActivity implements OnTouchListener {
    */
   private MyTracksProviderUtils providerUtils;
 
-  /**
-   * Google Analytics tracker
-   */
-  private GoogleAnalyticsTracker tracker;
-
   /*
    * Tabs/View navigation:
    */
@@ -144,12 +139,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
       ApiAdapterFactory.getApiAdapter().enableStrictMode();
     }
 
-    tracker = GoogleAnalyticsTracker.getInstance();
+    AnalyticsUtils.sendPageViews(this, "/appstart");
-    // Start the tracker in manual dispatch mode...
-    tracker.start(getString(R.string.my_tracks_analytics_id), getApplicationContext());
-    tracker.setProductVersion("android-mytracks", SystemUtils.getMyTracksVersion(this));
-    tracker.trackPageView("/appstart");
-    tracker.dispatch();
 
     providerUtils = MyTracksProviderUtils.Factory.get(this);
     preferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
@@ -256,8 +246,6 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   protected void onStop() {
     Log.d(TAG, "MyTracks.onStop");
     dataHub.stop();
-    tracker.dispatch();
-    tracker.stop();
     super.onStop();
   }
 

MyTracks/src/com/google/android/apps/mytracks/SearchActivity.java

@@ -207,9 +207,8 @@ public class SearchActivity extends ListActivity {
     resultMap.put(DESCRIPTION_FIELD, track.getDescription());
     resultMap.put(CATEGORY_FIELD, track.getCategory());
     resultMap.put(TIME_FIELD, StringUtils.formatDateTime(this, stats.getStartTime()));
-    resultMap.put(STATS_FIELD,
+    resultMap.put(STATS_FIELD, StringUtils.formatTimeDistance(
-        StringUtils.formatTimeDistance(this, stats.getTotalDistance(), stats.getTotalTime(),
+        this, stats.getTotalTime(), stats.getTotalDistance(), metricUnits));
-            metricUnits));
     resultMap.put(TRACK_ID_FIELD, track.getId());
   }
 

MyTracks/src/com/google/android/apps/mytracks/TrackList.java

@@ -349,7 +349,8 @@ public class TrackList extends ListActivity
         } else if (columnIndex == totalDistanceIdx) {
           double totalDistance = cursor.getDouble(totalDistanceIdx);
           long totalTime = cursor.getLong(totalTimeIdx);
-          String totalDistanceStr = StringUtils.formatTimeDistance(TrackList.this, totalDistance, totalTime, metricUnits);
+          String totalDistanceStr = StringUtils.formatTimeDistance(
+              TrackList.this, totalTime, totalDistance, metricUnits);
           textView.setText(totalDistanceStr);
         } else {
           textView.setText(cursor.getString(columnIndex));

MyTracks/src/com/google/android/apps/mytracks/io/docs/SendDocsUtils.java

@@ -300,8 +300,8 @@ public class SendDocsUtils {
     appendTag(builder, "name", track.getName());
     appendTag(builder, "description", track.getDescription());
     appendTag(builder, "date", StringUtils.formatDateTime(context, stats.getStartTime()));
-    appendTag(builder, "totaltime", StringUtils.formatElapsedTime(stats.getTotalTime()));
+    appendTag(builder, "totaltime", StringUtils.formatElapsedTimeWithHour(stats.getTotalTime()));
-    appendTag(builder, "movingtime", StringUtils.formatElapsedTime(stats.getMovingTime()));
+    appendTag(builder, "movingtime", StringUtils.formatElapsedTimeWithHour(stats.getMovingTime()));
     appendTag(builder, "distance", getDistance(stats.getTotalDistance(), metricUnits));
     appendTag(builder, "distanceunit", distanceUnit);
     appendTag(builder, "averagespeed", getSpeed(stats.getAverageSpeed(), metricUnits));
@@ -335,7 +335,7 @@ public class SendDocsUtils {
         .append("<gsx:")
         .append(name)
         .append(">")
-        .append(StringUtils.stringAsCData(value))
+        .append(StringUtils.formatCData(value))
         .append("</gsx:")
         .append(name)
         .append(">");

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

@@ -22,7 +22,7 @@ import com.google.android.apps.mytracks.content.Sensor.SensorDataSet;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
-import com.google.android.apps.mytracks.util.FileUtils;
+import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.content.Context;
@@ -130,7 +130,7 @@ public class CsvTrackWriter implements TrackFormatWriter {
         Double.toString(location.getBearing()),
         SHORT_FORMAT.format(location.getAccuracy()),
         SHORT_FORMAT.format(location.getSpeed()),
-        FileUtils.FILE_TIMESTAMP_FORMAT.format(location.getTime()));
+        StringUtils.formatDateTimeIso8601(location.getTime()));
   }
 
   @Override
@@ -211,7 +211,7 @@ public class CsvTrackWriter implements TrackFormatWriter {
         Double.toString(location.getBearing()),
         SHORT_FORMAT.format(location.getAccuracy()),
         SHORT_FORMAT.format(location.getSpeed()),
-        FileUtils.FILE_TIMESTAMP_FORMAT.format(location.getTime()),
+        StringUtils.formatDateTimeIso8601(location.getTime()),
         power,
         cadence,
         heartRate,

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

@@ -450,7 +450,7 @@ public class GpxImporter extends DefaultHandler {
     // Parse the time
     long time;
     try {
-      time = StringUtils.parseXmlDateTime(content.trim());
+      time = StringUtils.getTime(content.trim());
     } catch (IllegalArgumentException e) {
       String msg = createErrorMessage("Unable to parse time: " + content);
       throw new SAXException(msg, e);

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

@@ -18,7 +18,6 @@ package com.google.android.apps.mytracks.io.file;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
-import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.maps.mytracks.R;
 
@@ -94,8 +93,8 @@ public class GpxTrackWriter implements TrackFormatWriter {
           + " http://www.topografix.com/GPX/Private/TopoGrafix/0/1"
           + " http://www.topografix.com/GPX/Private/TopoGrafix/0/1/topografix.xsd\">");
       printWriter.println("<metadata>");
-      printWriter.println("<name>" + StringUtils.stringAsCData(track.getName()) + "</name>");
+      printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
-      printWriter.println("<desc>" + StringUtils.stringAsCData(track.getDescription()) + "</desc>");
+      printWriter.println("<desc>" + StringUtils.formatCData(track.getDescription()) + "</desc>");
       printWriter.println("</metadata>");
     }
   }
@@ -111,8 +110,8 @@ public class GpxTrackWriter implements TrackFormatWriter {
   public void writeBeginTrack(Location firstLocation) {
     if (printWriter != null) {
       printWriter.println("<trk>");
-      printWriter.println("<name>" + StringUtils.stringAsCData(track.getName()) + "</name>");
+      printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
-      printWriter.println("<desc>" + StringUtils.stringAsCData(track.getDescription()) + "</desc>");
+      printWriter.println("<desc>" + StringUtils.formatCData(track.getDescription()) + "</desc>");
       printWriter.println("<extensions><topografix:color>c0c0c0</topografix:color></extensions>");
     }
   }
@@ -139,8 +138,7 @@ public class GpxTrackWriter implements TrackFormatWriter {
     if (printWriter != null) {
       printWriter.println("<trkpt " + formatLocation(location) + ">");
       printWriter.println("<ele>" + ELEVATION_FORMAT.format(location.getAltitude()) + "</ele>");
-      printWriter.println(
+      printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(location.getTime()) + "</time>");
-          "<time>" + FileUtils.FILE_TIMESTAMP_FORMAT.format(location.getTime()) + "</time>");
       printWriter.println("</trkpt>");
     }
   }
@@ -162,11 +160,10 @@ public class GpxTrackWriter implements TrackFormatWriter {
       if (location != null) {
         printWriter.println("<wpt " + formatLocation(location) + ">");
         printWriter.println("<ele>" + ELEVATION_FORMAT.format(location.getAltitude()) + "</ele>");
+        printWriter.println("<time>" + StringUtils.formatDateTimeIso8601(location.getTime()) + "</time>");
+        printWriter.println("<name>" + StringUtils.formatCData(waypoint.getName()) + "</name>");
         printWriter.println(
-            "<time>" + FileUtils.FILE_TIMESTAMP_FORMAT.format(location.getTime()) + "</time>");
+            "<desc>" + StringUtils.formatCData(waypoint.getDescription()) + "</desc>");
-        printWriter.println("<name>" + StringUtils.stringAsCData(waypoint.getName()) + "</name>");
-        printWriter.println(
-            "<desc>" + StringUtils.stringAsCData(waypoint.getDescription()) + "</desc>");
         printWriter.println("</wpt>");
       }
     }

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

@@ -24,7 +24,6 @@ import com.google.android.apps.mytracks.content.Sensor.SensorDataSet;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
-import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.maps.mytracks.R;
 import com.google.common.annotations.VisibleForTesting;
@@ -43,6 +42,11 @@ import java.util.ArrayList;
  */
 public class KmlTrackWriter implements TrackFormatWriter {
 
+  /**
+   * ID of the KML feature to play a tour.
+   */
+  public static final String TOUR_FEATURE_ID = "tour";
+
   private static final String WAYPOINT_STYLE = "waypoint";
   private static final String STATISTICS_STYLE = "statistics";
   private static final String START_STYLE = "start";
@@ -107,9 +111,9 @@ public class KmlTrackWriter implements TrackFormatWriter {
       printWriter.println("<open>1</open>");
       printWriter.println("<visibility>1</visibility>");
       printWriter.println(
-          "<description>" + StringUtils.stringAsCData(track.getDescription()) + "</description>");
+          "<description>" + StringUtils.formatCData(track.getDescription()) + "</description>");
-      printWriter.println("<name>" + StringUtils.stringAsCData(track.getName()) + "</name>");
+      printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
-      printWriter.println("<atom:author><atom:name>" + StringUtils.stringAsCData(
+      printWriter.println("<atom:author><atom:name>" + StringUtils.formatCData(
           context.getString(R.string.send_google_by_my_tracks, "", ""))
           + "</atom:name></atom:author>");
       writeTrackStyle();
@@ -142,7 +146,7 @@ public class KmlTrackWriter implements TrackFormatWriter {
   public void writeBeginWaypoints() {
     if (printWriter != null) {
       printWriter.println(
-          "<Folder><name>" + StringUtils.stringAsCData(context.getString(R.string.menu_markers))
+          "<Folder><name>" + StringUtils.formatCData(context.getString(R.string.menu_markers))
               + "</name>");
     }
   }
@@ -169,10 +173,10 @@ public class KmlTrackWriter implements TrackFormatWriter {
     if (printWriter != null) {
       String name = context.getString(R.string.marker_label_start, track.getName());
       writePlacemark(name, track.getDescription(), START_STYLE, firstLocation);
-      printWriter.println("<Placemark>");
+      printWriter.println("<Placemark id=\"" + TOUR_FEATURE_ID + "\">");
       printWriter.println(
-          "<description>" + StringUtils.stringAsCData(track.getDescription()) + "</description>");
+          "<description>" + StringUtils.formatCData(track.getDescription()) + "</description>");
-      printWriter.println("<name>" + StringUtils.stringAsCData(track.getName()) + "</name>");
+      printWriter.println("<name>" + StringUtils.formatCData(track.getName()) + "</name>");
       printWriter.println("<styleUrl>#" + TRACK_STYLE + "</styleUrl>");
       printWriter.println("<gx:MultiTrack>");
       printWriter.println("<altitudeMode>absolute</altitudeMode>");
@@ -232,8 +236,7 @@ public class KmlTrackWriter implements TrackFormatWriter {
   @Override
   public void writeLocation(Location location) {
     if (printWriter != null) {
-      printWriter.println(
+      printWriter.println("<when>" + StringUtils.formatDateTimeIso8601(location.getTime()) + "</when>");
-          "<when>" + FileUtils.FILE_TIMESTAMP_FORMAT.format(location.getTime()) + "</when>");
       printWriter.println(
           "<gx:coord>" + location.getLongitude() + " " + location.getLatitude() + " "
               + location.getAltitude() + "</gx:coord>");
@@ -309,8 +312,8 @@ public class KmlTrackWriter implements TrackFormatWriter {
     if (location != null) {
       printWriter.println("<Placemark>");
       printWriter.println(
-          "<description>" + StringUtils.stringAsCData(description) + "</description>");
+          "<description>" + StringUtils.formatCData(description) + "</description>");
-      printWriter.println("<name>" + StringUtils.stringAsCData(name) + "</name>");
+      printWriter.println("<name>" + StringUtils.formatCData(name) + "</name>");
       printWriter.println("<styleUrl>#" + styleName + "</styleUrl>");
       printWriter.println("<Point>");
       printWriter.println(
@@ -356,7 +359,7 @@ public class KmlTrackWriter implements TrackFormatWriter {
   private void writeSensorStyle(String name, String displayName) {
     printWriter.println("<gx:SimpleArrayField name=\"" + name + "\" type=\"int\">");
     printWriter.println(
-        "<displayName>" + StringUtils.stringAsCData(displayName) + "</displayName>");
+        "<displayName>" + StringUtils.formatCData(displayName) + "</displayName>");
     printWriter.println("</gx:SimpleArrayField>");
   }
 }

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

@@ -159,9 +159,11 @@ public class SaveActivity extends Activity {
 
     Uri uri = Uri.fromFile(new File(writer.getAbsolutePath()));
     Intent intent = new Intent()
+        .setClassName(PlayTrackUtils.GOOGLE_EARTH_PACKAGE, PlayTrackUtils.GOOGLE_EARTH_CLASS)
         .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
         .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        .setDataAndType(uri, PlayTrackUtils.KML_MIME_TYPE);
+        .setDataAndType(uri, PlayTrackUtils.KML_MIME_TYPE)
+        .putExtra(PlayTrackUtils.TOUR_FEATURE_ID, KmlTrackWriter.TOUR_FEATURE_ID);
     startActivity(intent);
   }
 

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

@@ -22,86 +22,89 @@ import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
 import com.google.android.apps.mytracks.lib.R;
-import com.google.android.apps.mytracks.util.FileUtils;
+import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.apps.mytracks.util.SystemUtils;
 
 import android.content.Context;
 import android.location.Location;
-import android.os.Build;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.nio.charset.Charset;
-import java.util.Date;
 import java.util.Locale;
 
 /**
- * Write out a a track in the Garmin training center database, tcx format.
+ * Write track as TCX to a file. See http://developer.garmin.com/schemas/tcx/v2/
- * As defined by:
+ * for info on TCX. <br>
- * http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2
+ * The TCX file output is verified by uploading the file to
- *
+ * http://connect.garmin.com/.
- * The TCX file written by this class has been verified as compatible with
- * Garmin Training Center 3.5.3.
  *
  * @author Sandor Dornbush
  * @author Dominik Ršttsches
  */
 public class TcxTrackWriter implements TrackFormatWriter {
 
-  // "Biking" related string IDs
+  /**
+   * TCX sport type. See the TCX spec.
+   *
+   * @author Jimmy Shih
+   */
+  private enum SportType {
+    RUNNING("Running"),
+    BIKING("Biking"),
+    OTHER("Other");
+
+    private final String name;
+
+    private SportType(String name) {
+      this.name = name;
+    }
+
+    /**
+     * Gets the name of the sport type
+     */
+    public String getName() {
+      return name;
+    }
+  }
+
+  // My Tracks categories that are considered as TCX biking sport type.
   private static final int TCX_SPORT_BIKING_IDS[] = {
       R.string.activity_type_cycling,
       R.string.activity_type_dirt_bike,
       R.string.activity_type_mountain_biking,
       R.string.activity_type_road_biking,
-      R.string.activity_type_track_cycling,
+      R.string.activity_type_track_cycling };
-  };
 
-  // "Running" related string IDs
+  // My Tracks categories that are considered as TCX running sport type.
   private static final int TCX_SPORT_RUNNING_IDS[] = {
       R.string.activity_type_running,
       R.string.activity_type_speed_walking,
       R.string.activity_type_street_running,
       R.string.activity_type_track_running,
       R.string.activity_type_trail_running,
-      R.string.activity_type_walking,
+      R.string.activity_type_walking };
-  };
-
-  // These are the only sports allowed by the TCX v2 specification for fields
-  // of type Sport_t.
-  private static final String TCX_SPORT_BIKING = "Biking";
-  private static final String TCX_SPORT_RUNNING = "Running";
-  private static final String TCX_SPORT_OTHER = "Other";
-
-  // Values for fields of type Build_t/Type.
-  private static final String TCX_TYPE_RELEASE = "Release";
-  private static final String TCX_TYPE_INTERNAL = "Internal";
 
   private final Context context;
-
-  private PrintWriter pw = null;
   private Track track;
-
+  private PrintWriter printWriter;
-  // Determines whether to encode cadence value as running or cycling cadence.
+  private SportType sportType;
-  private boolean sportIsCycling;
 
   public TcxTrackWriter(Context context) {
     this.context = context;
   }
 
-  @SuppressWarnings("hiding")
   @Override
-  public void prepare(Track track, OutputStream out) {
+  public void prepare(Track aTrack, OutputStream out) {
-    this.track = track;
+    this.track = aTrack;
-    this.pw = new PrintWriter(out);
+    this.printWriter = new PrintWriter(out);
-    this.sportIsCycling = categoryToTcxSport(track.getCategory()).equals(TCX_SPORT_BIKING);
+    this.sportType = getSportType(track.getCategory());
   }
 
   @Override
   public void close() {
-    if (pw != null) {
+    if (printWriter != null) {
-      pw.close();
+      printWriter.close();
-      pw = null;
+      printWriter = null;
     }
   }
 
@@ -112,246 +115,214 @@ public class TcxTrackWriter implements TrackFormatWriter {
 
   @Override
   public void writeHeader() {
-    if (pw == null) {
+    if (printWriter != null) {
-      return;
+      printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+      printWriter.println("<TrainingCenterDatabase"
+          + " xmlns=\"http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2\"");
+      printWriter.println("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
+      printWriter.println("xsi:schemaLocation=" 
+          + "\"http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2"
+          + " http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd\">");
+    }
+  }
+
+  @Override
+  public void writeFooter() {
+    if (printWriter != null) {
+      printWriter.println("<Author xsi:type=\"Application_t\">");
+      printWriter.println("<Name>" 
+          + StringUtils.formatCData(context.getString(R.string.send_google_by_my_tracks, "", "")) 
+          + "</Name>");
+      // <Build>, <LangID>, and <PartNumber> are required by type=Application_t.
+      printWriter.println("<Build>");
+      writeVersion();
+      printWriter.println("</Build>");
+      printWriter.println("<LangID>" + Locale.getDefault().getLanguage() + "</LangID>");
+      printWriter.println("<PartNumber>000-00000-00</PartNumber>");
+      printWriter.println("</Author>");
+      printWriter.println("</TrainingCenterDatabase>");
     }
-    pw.format("<?xml version=\"1.0\" encoding=\"%s\" standalone=\"no\" ?>\n",
-        Charset.defaultCharset().name());
-    pw.print("<TrainingCenterDatabase ");
-    pw.print("xmlns=\"http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2\" ");
-    pw.print("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ");
-    pw.print("xsi:schemaLocation=\"http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 ");
-    pw.println("http://www.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd\">");
-    pw.println();
   }
 
   @Override
   public void writeBeginTrack(Location firstPoint) {
-    if (pw == null) {
+    if (printWriter != null) {
-      return;
+      String startTime = StringUtils.formatDateTimeIso8601(track.getStatistics().getStartTime());
-    }
+      long totalTimeInSeconds = track.getStatistics().getTotalTime() / 1000;
 
-    String startTime = FileUtils.FILE_TIMESTAMP_FORMAT.format(track.getStatistics().getStartTime());
+      printWriter.println("<Activities>");
-
+      printWriter.println("<Activity Sport=\"" + sportType.getName() + "\">");
-    pw.println("  <Activities>");
+      printWriter.println("<Id>" + startTime + "</Id>");
-    pw.format("    <Activity Sport=\"%s\">\n", categoryToTcxSport(track.getCategory()));
+      printWriter.println("<Lap StartTime=\"" + startTime + "\">");
-    pw.format("      <Id>%s</Id>\n", startTime);
+      printWriter.println("<TotalTimeSeconds>" + totalTimeInSeconds + "</TotalTimeSeconds>");
-    pw.format("      <Lap StartTime=\"%s\">\n", startTime);
+      printWriter.println("<DistanceMeters>" + track.getStatistics().getTotalDistance()
-    pw.print("        <TotalTimeSeconds>");
+          + "</DistanceMeters>");
-    pw.print(track.getStatistics().getTotalTime() / 1000);
+      // <Calories> is required, just put in 0.
-    pw.println("</TotalTimeSeconds>");
+      printWriter.println("<Calories>0</Calories>");
-    pw.print("        <DistanceMeters>");
+      printWriter.println("<Intensity>Active</Intensity>");
-    pw.print(track.getStatistics().getTotalDistance());
+      printWriter.println("<TriggerMethod>Manual</TriggerMethod>");
-    pw.println("</DistanceMeters>");
-    // TODO max speed etc.
-    // Calories are a required element just put in 0.
-    pw.print("<Calories>0</Calories>");
-    pw.println("<Intensity>Active</Intensity>");
-    pw.println("<TriggerMethod>Manual</TriggerMethod>");
-  }
-
-  @Override
-  public void writeOpenSegment() {
-    if (pw != null) {
-      pw.println("      <Track>");
-    }
-  }
-
-  @Override
-  public void writeLocation(Location location) {
-    if (pw == null) {
-      return;
-    }
-    pw.println("        <Trackpoint>");
-    Date d = new Date(location.getTime());
-    pw.println("          <Time>" + FileUtils.FILE_TIMESTAMP_FORMAT.format(d) + "</Time>");
-    pw.println("          <Position>");
-
-    pw.print("            <LatitudeDegrees>");
-    pw.print(location.getLatitude());
-    pw.println("</LatitudeDegrees>");
-
-    pw.print("            <LongitudeDegrees>");
-    pw.print(location.getLongitude());
-    pw.println("</LongitudeDegrees>");
-
-    pw.println("          </Position>");
-    pw.print("          <AltitudeMeters>");
-    pw.print(location.getAltitude());
-    pw.println("</AltitudeMeters>");
-
-    if (location instanceof MyTracksLocation) {
-      SensorDataSet sensorData = ((MyTracksLocation) location).getSensorDataSet();
-      if (sensorData != null) {
-        if (sensorData.hasHeartRate()
-            && sensorData.getHeartRate().getState() == Sensor.SensorState.SENDING
-            && sensorData.getHeartRate().hasValue()) {
-          pw.print("          <HeartRateBpm>");
-          pw.print("<Value>");
-          pw.print(sensorData.getHeartRate().getValue());
-          pw.print("</Value>");
-          pw.println("</HeartRateBpm>");
-        }
-
-        boolean cadenceAvailable = sensorData.hasCadence()
-          && sensorData.getCadence().getState() == Sensor.SensorState.SENDING
-          && sensorData.getCadence().hasValue();
-
-        // TCX Trackpoint_t contains a sequence. Thus, the legacy XML element
-        // <Cadence> needs to be put before <Extensions>.
-        // This field should only be used for the case that activity was marked as biking.
-        // Otherwise cadence is interpreted as running cadence data which
-        // is written in the <Extensions> as <RunCadence>.
-        if (sportIsCycling && cadenceAvailable) {
-          pw.print("          <Cadence>");
-          pw.print(Math.min(254, sensorData.getCadence().getValue()));
-          pw.println("</Cadence>");
-        }
-
-        boolean powerAvailable = sensorData.hasPower()
-          && sensorData.getPower().getState() == Sensor.SensorState.SENDING
-          && sensorData.getPower().hasValue();
-
-        if(powerAvailable || (!sportIsCycling && cadenceAvailable)) {
-          pw.print("          <Extensions>");
-          pw.print("<TPX xmlns=\"http://www.garmin.com/xmlschemas/ActivityExtension/v2\">");
-
-          // RunCadence needs to be put before power in order to be understood
-          // by Garmin Training Center.
-          if (!sportIsCycling && cadenceAvailable) {
-            pw.print("<RunCadence>");
-            pw.print(Math.min(254, sensorData.getCadence().getValue()));
-            pw.print("</RunCadence>");
-          }
-
-          if (powerAvailable) {
-            pw.print("<Watts>");
-            pw.print(sensorData.getPower().getValue());
-            pw.print("</Watts>");
-          }
-
-          pw.println("</TPX></Extensions>");
-        }
-      }
-    }
-    pw.println("        </Trackpoint>");
-  }
-
-  @Override
-  public void writeCloseSegment() {
-    if (pw != null) {
-      pw.println("      </Track>");
     }
   }
 
   @Override
   public void writeEndTrack(Location lastPoint) {
-    if (pw == null) {
+    if (printWriter != null) {
-      return;
+      printWriter.println("</Lap>");
+      printWriter.println("<Creator xsi:type=\"Device_t\">");
+      printWriter.println("<Name>" 
+          + StringUtils.formatCData(context.getString(R.string.send_google_by_my_tracks, "", "")) 
+          + "</Name>");
+      // <UnitId>, <ProductID>, and <Version> are required for type=Device_t.
+      printWriter.println("<UnitId>0</UnitId>");
+      printWriter.println("<ProductID>0</ProductID>");
+      writeVersion();
+      printWriter.println("</Creator>");
+      printWriter.println("</Activity>");
+      printWriter.println("</Activities>");
     }
-    pw.println("      </Lap>");
-    pw.print("      <Creator xsi:type=\"Device_t\">");
-    pw.format("<Name>My Tracks running on %s</Name>\n", Build.MODEL);
-
-    // The following code is correct.  ID is inconsistently capitalized in the
-    // TCX schema.
-    pw.println("<UnitId>0</UnitId>");
-    pw.println("<ProductID>0</ProductID>");
-
-    writeVersion();
-
-    pw.println("</Creator>");
-    pw.println("    </Activity>");
-    pw.println("  </Activities>");
   }
 
   @Override
-  public void writeFooter() {
+  public void writeOpenSegment() {
-    if (pw == null) {
+    if (printWriter != null) {
-      return;
+      printWriter.println("<Track>");
     }
-    pw.println("  <Author xsi:type=\"Application_t\">");
+  }
 
-    // We put the version in the name because there isn't a better place for
+  @Override
-    // it.  The TCX schema tightly defined the Version tag, so we can't put it
+  public void writeCloseSegment() {
-    // there.  They've similarly constrained the PartNumber tag, so it can't go
+    if (printWriter != null) {
-    // there either.
+      printWriter.println("</Track>");
-    pw.format("<Name>My Tracks %s by Google</Name>\n", SystemUtils.getMyTracksVersion(context));
+    }
+  }
 
-    pw.println("<Build>");
+  @Override
+  public void writeLocation(Location location) {
+    if (printWriter != null) {
+      printWriter.println("<Trackpoint>");
+      printWriter.println("<Time>" + StringUtils.formatDateTimeIso8601(location.getTime()) + "</Time>");
+      printWriter.println("<Position>");
+      printWriter.println("<LatitudeDegrees>" + location.getLatitude() + "</LatitudeDegrees>");
+      printWriter.println("<LongitudeDegrees>" + location.getLongitude() + "</LongitudeDegrees>");
+      printWriter.println("</Position>");
+      printWriter.println("<AltitudeMeters>" + location.getAltitude() + "</AltitudeMeters>");
 
-    writeVersion();
+      if (location instanceof MyTracksLocation) {
+        SensorDataSet sensorDataSet = ((MyTracksLocation) location).getSensorDataSet();
+        if (sensorDataSet != null) {
+          boolean heartRateAvailable = sensorDataSet.hasHeartRate()
+              && sensorDataSet.getHeartRate().hasValue()
+              && sensorDataSet.getHeartRate().getState() == Sensor.SensorState.SENDING;
+          boolean cadenceAvailable = sensorDataSet.hasCadence()
+            && sensorDataSet.getCadence().hasValue()
+            && sensorDataSet.getCadence().getState() == Sensor.SensorState.SENDING;
+          boolean powerAvailable = sensorDataSet.hasPower() 
+            && sensorDataSet.getPower().hasValue()
+            && sensorDataSet.getPower().getState() == Sensor.SensorState.SENDING;
+          
+          if (heartRateAvailable) {
+            printWriter.println("<HeartRateBpm>");
+            printWriter.println("<Value>" + sensorDataSet.getHeartRate().getValue() + "</Value>");
+            printWriter.println("</HeartRateBpm>");
+          }
 
-    pw.format("<Type>%s</Type>\n", SystemUtils.isRelease(context) ? TCX_TYPE_RELEASE
+          // <Cadence> needs to be put before <Extensions>.
-        : TCX_TYPE_INTERNAL);
+          // According to the TCX spec, <Cadence> is only for the biking sport
-    pw.println("</Build>");
+          // type. For others, use <RunCadence> in <Extensions>.
-    pw.format("<LangID>%s</LangID>\n", Locale.getDefault().getLanguage());
+          if (cadenceAvailable && sportType == SportType.BIKING) {
-    pw.println("<PartNumber>000-00000-00</PartNumber>");
+            // The spec requires the max value be 254.
-    pw.println("</Author>");
+            printWriter.println(
-    pw.println("</TrainingCenterDatabase>");
+                "<Cadence>" + Math.min(254, sensorDataSet.getCadence().getValue()) + "</Cadence>");
+          }
+
+          if ((cadenceAvailable && sportType != SportType.BIKING) || powerAvailable) {
+            printWriter.println("<Extensions>");
+            printWriter.println(
+                "<TPX xmlns=\"http://www.garmin.com/xmlschemas/ActivityExtension/v2\">");
+
+            // <RunCadence> needs to be put before <Watts>.
+            if (cadenceAvailable && sportType != SportType.BIKING) {
+              // The spec requires the max value to be 254.
+              printWriter.println("<RunCadence>"
+                  + Math.min(254, sensorDataSet.getCadence().getValue()) + "</RunCadence>");
+            }
+
+            if (powerAvailable) {
+              printWriter.println("<Watts>" + sensorDataSet.getPower().getValue() + "</Watts>");
+            }
+            printWriter.println("</TPX>");
+            printWriter.println("</Extensions>");
+          }
+        }
+      }
+      printWriter.println("</Trackpoint>");
+    }
   }
 
   @Override
   public void writeBeginWaypoints() {
-    // Do nothing
+    // Do nothing.
   }
 
   @Override
   public void writeEndWaypoints() {
-    // Do nothing
+    // Do nothing.
   }
 
   @Override
   public void writeWaypoint(Waypoint waypoint) {
-    // TODO Write out the waypoints somewhere.
+    // Do nothing.
   }
 
+  /**
+   * Writes the TCX Version.
+   */
   private void writeVersion() {
-    if (pw == null) {
+    // Split the My Tracks version code into VersionMajor, VersionMinor, and,
-      return;
+    // BuildMajor to fit the integer type requirement for these fields in the
-    }
+    // TCX spec.
+    String[] versionComponents = SystemUtils.getMyTracksVersion(context).split("\\.");
+    int versionMajor = versionComponents.length > 0 ? Integer.valueOf(versionComponents[0]) : 0;
+    int versionMinor = versionComponents.length > 1 ? Integer.valueOf(versionComponents[1]) : 0;
+    int buildMajor = versionComponents.length > 2 ? Integer.valueOf(versionComponents[2]) : 0;
 
-    // Splitting the myTracks version code into VersionMajor, VersionMinor and BuildMajor
+    printWriter.println("<Version>");
-    // to fit the integer type requirement for these fields in the TCX spec.
+    printWriter.println("<VersionMajor>" + versionMajor + "</VersionMajor>");
-    // Putting a string like "x.x.x" into VersionMajor breaks XML validation.
+    printWriter.println("<VersionMinor>" + versionMinor + "</VersionMinor>");
-    // We also set the BuildMinor version to 1 if this is a development build to
+    // According to TCX spec, these are optional. But http://connect.garmin.com
-    // signify that this build is newer than the one associated with the
+    // requires them.
-    // version code given in BuildMajor.
+    printWriter.println("<BuildMajor>" + buildMajor + "</BuildMajor>");
-
+    printWriter.println("<BuildMinor>0</BuildMinor>");
-    String[] myTracksVersionComponents = SystemUtils.getMyTracksVersion(context).split("\\.");
+    printWriter.println("</Version>");
-
-    pw.println("<Version>");
-    pw.format("<VersionMajor>%d</VersionMajor>\n", Integer.valueOf(myTracksVersionComponents[0]));
-    pw.format("<VersionMinor>%d</VersionMinor>\n", Integer.valueOf(myTracksVersionComponents[1]));
-    // TCX schema says these are optional but http://connect.garmin.com only accepts
-    // the TCX file when they are present.
-    pw.format("<BuildMajor>%d</BuildMajor>\n", Integer.valueOf(myTracksVersionComponents[2]));
-    pw.format("<BuildMinor>%d</BuildMinor>\n", SystemUtils.isRelease(context) ? 0 : 1);
-    pw.println("</Version>");
   }
 
-  private String categoryToTcxSport(String category) {
+  /**
+   * Gets the sport type from the category.
+   *
+   * @param category the category
+   */
+  private SportType getSportType(String category) {
     category = category.trim();
 
-    // category is possibly localized here, so compare it to localized string resources
+    // For tracks with localized category.
     for (int i : TCX_SPORT_RUNNING_IDS) {
-      if (category.equalsIgnoreCase(context.getResources().getString(i))) {
+      if (category.equalsIgnoreCase(context.getString(i))) {
-        return TCX_SPORT_RUNNING;
+        return SportType.RUNNING;
       }
     }
     for (int i : TCX_SPORT_BIKING_IDS) {
-      if (category.equalsIgnoreCase(context.getResources().getString(i))) {
+      if (category.equalsIgnoreCase(context.getString(i))) {
-        return TCX_SPORT_BIKING;
+        return SportType.BIKING;
       }
     }
 
-    // for tracks without localized activity type
+    // For tracks without localized category.
-    if (category.equalsIgnoreCase(TCX_SPORT_RUNNING)) {
+    if (category.equalsIgnoreCase(SportType.RUNNING.getName())) {
-      return TCX_SPORT_RUNNING;
+      return SportType.RUNNING;
-    } else if (category.equalsIgnoreCase(TCX_SPORT_BIKING)) {
+    } else if (category.equalsIgnoreCase(SportType.BIKING.getName())) {
-      return TCX_SPORT_BIKING;
+      return SportType.BIKING;
     } else {
-      return TCX_SPORT_OTHER;
+      return SportType.OTHER;
     }
   }
 }

MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesActivity.java

@@ -21,6 +21,7 @@ import com.google.android.apps.mytracks.io.sendtogoogle.AbstractSendAsyncTask;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;
 
 import android.content.Intent;
 
@@ -45,18 +46,23 @@ public class SendFusionTablesActivity extends AbstractSendActivity {
   protected void startNextActivity(boolean success, boolean isCancel) {
     sendRequest.setFusionTablesSuccess(success);
 
-    Class<?> next;
+    Class<?> next = getNextClass(sendRequest, isCancel);
-    if (isCancel) {
+    
-      next = UploadResultActivity.class;
-    } else {
-      if (sendRequest.isSendDocs()) {
-        next = SendDocsActivity.class;
-      } else {
-        next = UploadResultActivity.class;
-      }
-    }
     Intent intent = new Intent(this, next).putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest);
     startActivity(intent);
     finish();
   }
+  
+  @VisibleForTesting
+  Class<?> getNextClass(SendRequest request, boolean isCancel) {
+  if (isCancel) {
+        return UploadResultActivity.class;
+      } else {
+        if (request.isSendDocs()) {
+          return SendDocsActivity.class;
+        } else {
+          return UploadResultActivity.class;
+        }
+      }
+  }
 }

MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java

@@ -454,7 +454,7 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask {
    * @param total the number of total locations
    */
   private void updateProgress(int uploaded, int total) {
-    double totalPercentage = uploaded / total;
+    double totalPercentage = (double) uploaded / total;
     double scaledPercentage = totalPercentage
         * (PROGRESS_UPLOAD_DATA_MAX - PROGRESS_UPLOAD_DATA_MIN) + PROGRESS_UPLOAD_DATA_MIN;
     publishProgress((int) scaledPercentage);

MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java

@@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.io.maps;
 import com.google.android.apps.mytracks.io.gdata.maps.MapsMapMetadata;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -46,12 +47,14 @@ import java.util.ArrayList;
 public class ChooseMapActivity extends Activity {
 
   private static final int PROGRESS_DIALOG = 1;
-  private static final int ERROR_DIALOG = 2;
+  @VisibleForTesting
-  
+  static final int ERROR_DIALOG = 2;
+
   private SendRequest sendRequest;
   private ChooseMapAsyncTask asyncTask;
   private ProgressDialog progressDialog;
-  private ArrayAdapter<ListItem> arrayAdapter;
+  @VisibleForTesting
+  ArrayAdapter<ListItem> arrayAdapter;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -166,7 +169,7 @@ public class ChooseMapActivity extends Activity {
    */
   public void onAsyncTaskCompleted(
       boolean success, ArrayList<String> mapIds, ArrayList<MapsMapMetadata> mapData) {
-    removeDialog(PROGRESS_DIALOG);
+    removeProgressDialog();
     if (success) {
       arrayAdapter.clear();
       // To prevent displaying the emptyView message momentarily before the
@@ -181,7 +184,7 @@ public class ChooseMapActivity extends Activity {
         }
       }
     } else {
-      showDialog(ERROR_DIALOG);
+      showErrorDialog();
     }
   }
 
@@ -191,6 +194,22 @@ public class ChooseMapActivity extends Activity {
   public void showProgressDialog() {
     showDialog(PROGRESS_DIALOG);
   }
+  
+  /**
+   * Shows the error dialog.
+   */
+  @VisibleForTesting
+  void showErrorDialog() {
+    showDialog(ERROR_DIALOG);
+  }
+  
+  /**
+   * Remove the progress dialog.
+   */
+  @VisibleForTesting
+  void removeProgressDialog() {
+    removeDialog(PROGRESS_DIALOG);
+  }
 
   /**
    * Starts the next activity, {@link SendMapsActivity}.
@@ -210,7 +229,8 @@ public class ChooseMapActivity extends Activity {
    *
    * @author Jimmy Shih
    */
-  private class ListItem {
+  @VisibleForTesting
+  class ListItem {
     private String mapId;
     private MapsMapMetadata mapData;
 
@@ -233,4 +253,4 @@ public class ChooseMapActivity extends Activity {
       return mapData;
     }
   }
-}
+}

MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsActivity.java

@@ -22,6 +22,7 @@ import com.google.android.apps.mytracks.io.sendtogoogle.AbstractSendAsyncTask;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;
 
 import android.content.Intent;
 
@@ -47,20 +48,25 @@ public class SendMapsActivity extends AbstractSendActivity {
   protected void startNextActivity(boolean success, boolean isCancel) {
     sendRequest.setMapsSuccess(success);
 
-    Class<?> next;
+    Class<?> next = getNextClass(sendRequest, isCancel);
-    if (isCancel) {
+    
-      next = UploadResultActivity.class;
-    } else {
-      if (sendRequest.isSendFusionTables()) {
-        next = SendFusionTablesActivity.class;
-      } else if (sendRequest.isSendDocs()) {
-        next = SendDocsActivity.class;
-      } else {
-        next = UploadResultActivity.class;
-      }
-    }
     Intent intent = new Intent(this, next).putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest);
     startActivity(intent);
     finish();
   }
+  
+  @VisibleForTesting
+  Class<?> getNextClass(SendRequest request, boolean isCancel) {
+    if (isCancel) {
+      return UploadResultActivity.class;
+    } else {
+      if (request.isSendFusionTables()) {
+        return SendFusionTablesActivity.class;
+      } else if (request.isSendDocs()) {
+        return SendDocsActivity.class;
+      } else {
+        return UploadResultActivity.class;
+      }
+    }
+  }
 }

MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java

@@ -472,8 +472,8 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask {
    * @param total the number of total locations
    */
   private void updateProgress(int uploaded, int total) {
-    double totalPercentage = uploaded / total;
+    double totalPercentage = (double) uploaded / total;
-    double scaledPercentage = totalPercentage
+    double scaledPercentage =  totalPercentage
         * (PROGRESS_UPLOAD_DATA_MAX - PROGRESS_UPLOAD_DATA_MIN) + PROGRESS_UPLOAD_DATA_MIN;
     publishProgress((int) scaledPercentage);
   }

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

@@ -109,7 +109,7 @@ public class AccountChooserActivity extends Activity {
     super.onResume();
     if (accounts.length == 0) {
       showDialog(NO_ACCOUNT_DIALOG);
-    } else {
+    } else if (accounts.length > 1 ) {
       showDialog(CHOOSE_ACCOUNT_DIALOG);
     }
   }

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

@@ -15,10 +15,9 @@
  */
 package com.google.android.apps.mytracks.io.sendtogoogle;
 
-import com.google.android.apps.analytics.GoogleAnalyticsTracker;
 import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.util.AnalyticsUtils;
 import com.google.android.apps.mytracks.util.ApiAdapterFactory;
-import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.maps.mytracks.R;
 import com.google.common.annotations.VisibleForTesting;
 
@@ -39,6 +38,8 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.RadioButton;
 import android.widget.TableRow;
 
+import java.util.ArrayList;
+
 /**
  * A chooser to select the Google services to upload a track to.
  *
@@ -246,20 +247,17 @@ public class UploadServiceChooserActivity extends Activity {
    * Sends stats to Google Analytics.
    */
   private void sendStats() {
-    GoogleAnalyticsTracker tracker = GoogleAnalyticsTracker.getInstance();
+    ArrayList<String> pages = new ArrayList<String>();
-    tracker.start(getString(R.string.my_tracks_analytics_id), getApplicationContext());
-    tracker.setProductVersion("android-mytracks", SystemUtils.getMyTracksVersion(this));
     if (sendRequest.isSendMaps()) {
-      tracker.trackPageView("/send/maps");
+      pages.add("/send/maps");
     }
     if (sendRequest.isSendFusionTables()) {
-      tracker.trackPageView("/send/fusion_tables");
+      pages.add("/send/fusion_tables");
     }
     if (sendRequest.isSendDocs()) {
-      tracker.trackPageView("/send/docs");
+      pages.add("/send/docs");
     }
-    tracker.dispatch();
+    AnalyticsUtils.sendPageViews(this, pages.toArray(new String[pages.size()]));
-    tracker.stop();
   }
   
   @VisibleForTesting

MyTracks/src/com/google/android/apps/mytracks/util/AnalyticsUtils.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.android.apps.mytracks.util;
+
+import com.google.android.apps.analytics.GoogleAnalyticsTracker;
+import com.google.android.maps.mytracks.R;
+
+import android.content.Context;
+
+/**
+ * Utitlites for sending pageviews to Google Analytics.
+ *
+ * @author Jimmy Shih
+ */
+public class AnalyticsUtils {
+
+  private AnalyticsUtils() {}
+
+  public static void sendPageViews(Context context, String ... pages) {
+    GoogleAnalyticsTracker tracker = GoogleAnalyticsTracker.getInstance();
+    tracker.start(context.getString(R.string.my_tracks_analytics_id), context);
+    tracker.setProductVersion("android-mytracks", SystemUtils.getMyTracksVersion(context));
+    for (String page : pages) {
+      tracker.trackPageView(page);
+    }
+    tracker.dispatch();
+    tracker.stop();
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java

@@ -21,8 +21,6 @@ import com.google.common.annotations.VisibleForTesting;
 import android.os.Environment;
 
 import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.TimeZone;
 
 /**
  * Utilities for dealing with files.
@@ -38,16 +36,6 @@ public class FileUtils {
   @VisibleForTesting
   static final int MAX_FAT32_PATH_LENGTH = 260;
   
-  /**
-   * Timestamp format in UTC time zone.
-   */
-  public static final SimpleDateFormat FILE_TIMESTAMP_FORMAT =
-      new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-
-  static {
-    FILE_TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
-  }
-  
   /**
    * Builds a path inside the My Tracks directory in the SD card.
    *

MyTracks/src/com/google/android/apps/mytracks/util/PlayTrackUtils.java

@@ -45,14 +45,17 @@ public class PlayTrackUtils {
    * KML mime type.
    */
   public static final String KML_MIME_TYPE = "application/vnd.google-earth.kml+xml";
-
+  public static final String TOUR_FEATURE_ID = "com.google.earth.EXTRA.tour_feature_id";
-  private static final String GOOGLE_EARTH_PACKAGE = "com.google.earth";
+  
+  public static final String GOOGLE_EARTH_PACKAGE = "com.google.earth";
+  public static final String GOOGLE_EARTH_CLASS = "com.google.earth.EarthActivity";
   private static final String EARTN_MARKET_URI = "market://details?id=" + GOOGLE_EARTH_PACKAGE;
 
   private PlayTrackUtils() {}
 
   /**
-   * Returns true if Google Earth is installed.
+   * Returns true if a Google Earth app that can handle KML mine type is
+   * installed.
    *
    * @param context the context
    */
@@ -75,6 +78,8 @@ public class PlayTrackUtils {
    * @param trackId the track id
    */
   public static void playTrack(Context context, long trackId) {
+    AnalyticsUtils.sendPageViews(context, "/action/play");
+
     Uri uri = ContentUris.withAppendedId(TracksColumns.CONTENT_URI, trackId);
     Intent intent = new Intent(context, SaveActivity.class)
         .putExtra(SaveActivity.EXTRA_FILE_FORMAT, TrackFileFormat.KML.ordinal())

MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java

@@ -18,14 +18,13 @@ package com.google.android.apps.mytracks.util;
 import com.google.android.maps.mytracks.R;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.text.format.DateUtils;
 
-import java.text.DateFormat;
-import java.text.NumberFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.SimpleTimeZone;
+import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -37,19 +36,20 @@ import java.util.regex.Pattern;
  */
 public class StringUtils {
 
-  private StringUtils() {}
+  private static final SimpleDateFormat ISO_8601_DATE_TIME_FORMAT = new SimpleDateFormat(
+      "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+  private static final SimpleDateFormat ISO_8601_BASE = new SimpleDateFormat(
+      "yyyy-MM-dd'T'HH:mm:ss");
+  private static final Pattern ISO_8601_EXTRAS = Pattern.compile(
+      "^(\\.\\d+)?(?:Z|([+-])(\\d{2}):(\\d{2}))?$");
 
-  /**
+  static {
-   * Formats the date and time based on user's phone date/time preferences.
+    ISO_8601_DATE_TIME_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
-   *
+    ISO_8601_BASE.setTimeZone(TimeZone.getTimeZone("UTC"));
-   * @param context the context
-   * @param time the time in milliseconds
-   */
-  public static String formatDateTime(Context context, long time) {
-    DateFormat dateFormatter = android.text.format.DateFormat.getDateFormat(context);
-    return dateFormatter.format(new Date(time)) + " " + formatTime(context, time);
   }
 
+  private StringUtils() {}
+
   /**
    * Formats the time based on user's phone date/time preferences.
    *
@@ -57,8 +57,28 @@ public class StringUtils {
    * @param time the time in milliseconds
    */
   public static String formatTime(Context context, long time) {
-    DateFormat timeFormatter = android.text.format.DateFormat.getTimeFormat(context);
+    return android.text.format.DateFormat.getTimeFormat(context).format(time);
-    return timeFormatter.format(new Date(time));
+  }
+
+  /**
+   * Formats the date and time based on user's phone date/time preferences.
+   *
+   * @param context the context
+   * @param time the time in milliseconds
+   */
+  public static String formatDateTime(Context context, long time) {
+    return android.text.format.DateFormat.getDateFormat(context).format(time) + " "
+        + formatTime(context, time);
+  }
+
+  /**
+   * Formats the time using the ISO 8601 date time format with fractional
+   * seconds in UTC time zone.
+   *
+   * @param time the time in milliseconds
+   */
+  public static String formatDateTimeIso8601(long time) {
+    return ISO_8601_DATE_TIME_FORMAT.format(time);
   }
 
   /**
@@ -71,103 +91,117 @@ public class StringUtils {
   }
 
   /**
-   * Formats the elapsed time and total distance.
+   * Formats the elapsed time in the form "H:MM:SS".
    *
-   * @param context the current context
+   * @param time the time in milliseconds
-   * @param totalDistance the total distance in meters
-   * @param totalTime the total time in milliseconds
-   * @param metric whether to use metric units
-   * @return the formatted string
    */
-  public static String formatTimeDistance(Context context, double totalDistance, long totalTime, boolean metric) {
+  public static String formatElapsedTimeWithHour(long time) {
-    String distanceUnit;
+    String value = formatElapsedTime(time);
+    return TextUtils.split(value, ":").length == 2 ? "0:" + value : value;
+  }
+
+  /**
+   * Formats the distance.
+   *
+   * @param context the context
+   * @param distance the distance in meters
+   * @param metric true to use metric. False to use imperial
+   */
+  public static String formatDistance(Context context, double distance, boolean metric) {
     if (metric) {
-      if (totalDistance > 2000.0) {
+      if (distance > 2000.0) {
-        totalDistance *= UnitConversions.M_TO_KM;
+        distance *= UnitConversions.M_TO_KM;
-        distanceUnit = context.getString(R.string.unit_kilometer);
+        return context.getString(R.string.value_float_kilometer, distance);
       } else {
-        distanceUnit = context.getString(R.string.unit_meter);
+        return context.getString(R.string.value_float_meter, distance);        
       }
     } else {
-      if (totalDistance * UnitConversions.M_TO_MI > 2) {
+      if (distance * UnitConversions.M_TO_MI > 2) {
-        totalDistance *= UnitConversions.M_TO_MI;
+        distance *= UnitConversions.M_TO_MI;
-        distanceUnit = context.getString(R.string.unit_mile);
+        return context.getString(R.string.value_float_mile, distance);        
       } else {
-        totalDistance *= UnitConversions.M_TO_FT;
+        distance *= UnitConversions.M_TO_FT;
-        distanceUnit = context.getString(R.string.unit_feet);
+        return context.getString(R.string.value_float_feet, distance);
       }
     }
-    return String.format("%s  %.2f %s",
-        formatElapsedTime(totalTime),
-        totalDistance,
-        distanceUnit);
   }
-
+  
-  private static final NumberFormat SINGLE_DECIMAL_PLACE_FORMAT = NumberFormat.getNumberInstance();
-
-  static {
-    SINGLE_DECIMAL_PLACE_FORMAT.setMaximumFractionDigits(1);
-    SINGLE_DECIMAL_PLACE_FORMAT.setMinimumFractionDigits(1);
-  }
-
   /**
-   * Formats a double precision number as decimal number with a single decimal
+   * Formats the speed.
-   * place.
+   * 
-   *
+   * @param context the context
-   * @param number A double precision number
+   * @param speed the speed in meters per second
-   * @return A string representation of a decimal number, derived from the input
+   * @param metric true to use metric. False to use imperial
-   *         double, with a single decimal place
+   * @param reportSpeed true to report as speed. False to report as pace
    */
-  public static final String formatSingleDecimalPlace(double number) {
+  public static String formatSpeed(
-    return SINGLE_DECIMAL_PLACE_FORMAT.format(number);
+      Context context, double speed, boolean metric, boolean reportSpeed) {
-  }
+    if (Double.isNaN(speed) || Double.isInfinite(speed)) {
-
+      return context.getString(R.string.value_unknown);
-  /**
-   * Formats the given text as a CDATA element to be used in a XML file. This
-   * includes adding the starting and ending CDATA tags. Please notice that this
-   * may result in multiple consecutive CDATA tags.
-   *
-   * @param unescaped the unescaped text to be formatted
-   * @return the formatted text, inside one or more CDATA tags
-   */
-  public static String stringAsCData(String unescaped) {
-    // "]]>" needs to be broken into multiple CDATA segments, like:
-    // "Foo]]>Bar" becomes "<![CDATA[Foo]]]]><![CDATA[>Bar]]>"
-    // (the end of the first CDATA has the "]]", the other has ">")
-    String escaped = unescaped.replaceAll("]]>", "]]]]><![CDATA[>");
-    return "<![CDATA[" + escaped + "]]>";
-  }
-
-  private static final SimpleDateFormat BASE_XML_DATE_FORMAT =
-      new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-  static {
-    BASE_XML_DATE_FORMAT.setTimeZone(new SimpleTimeZone(0, "UTC"));
-  }
-
-  private static final Pattern XML_DATE_EXTRAS_PATTERN =
-      Pattern.compile("^(\\.\\d+)?(?:Z|([+-])(\\d{2}):(\\d{2}))?$");
-
-  /**
-   * Parses an XML dateTime element as defined by the XML standard.
-   *
-   * @see <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">dateTime</a>
-   */
-  public static long parseXmlDateTime(String xmlTime) {
-    // Parse the base date (fixed format)
-    ParsePosition position = new ParsePosition(0);
-    Date date = BASE_XML_DATE_FORMAT.parse(xmlTime, position);
-    if (date == null) {
-      throw new IllegalArgumentException("Invalid XML dateTime value: '" + xmlTime
-          + "' (at position " + position.getErrorIndex() + ")");
     }
+    if (metric) {
+      speed = speed * UnitConversions.MS_TO_KMH;
+      if (reportSpeed) {
+        return context.getString(R.string.value_float_kilometer_hour, speed);
+      } else {
+        double paceInMinute = speed == 0 ? 0.0 : 60 / speed;
+        return context.getString(R.string.value_float_minute_kilometer, paceInMinute);
+      }
+    } else {
+      speed = speed * UnitConversions.MS_TO_KMH * UnitConversions.KM_TO_MI;
+      if (reportSpeed) {
+        return context.getString(R.string.value_float_mile_hour, speed);
+      } else {
+        double paceInMinute = speed == 0 ? 0.0 : 60 / speed;
+        return context.getString(R.string.value_float_minute_mile, paceInMinute);
+      }
+    }
+  }
+  
+  /**
+   * Formats the elapsed time and distance.
+   *
+   * @param context the context
+   * @param elapsedTime the elapsed time in milliseconds
+   * @param distance the distance in meters
+   * @param metric true to use metric. False to use imperial
+   */
+  public static String formatTimeDistance(
+      Context context, long elapsedTime, double distance, boolean metric) {
+    return formatElapsedTime(elapsedTime) + " " + formatDistance(context, distance, metric);
+  }
 
-    // Parse the extras
+  /**
-    Matcher matcher =
+   * Formats the given text as a XML CDATA element. This includes adding the
-        XML_DATE_EXTRAS_PATTERN.matcher(xmlTime.substring(position.getIndex()));
+   * starting and ending CDATA tags. Please notice that this may result in
+   * multiple consecutive CDATA tags.
+   *
+   * @param text the given text
+   */
+  public static String formatCData(String text) {
+    return "<![CDATA[" + text.replaceAll("]]>", "]]]]><![CDATA[>") + "]]>";
+  }
+
+  /**
+   * Gets the time, in milliseconds, from an XML date time string as defined at
+   * http://www.w3.org/TR/xmlschema-2/#dateTime
+   *
+   * @param xmlDateTime the XML date time string
+   */
+  public static long getTime(String xmlDateTime) {
+    // Parse the date time base
+    ParsePosition position = new ParsePosition(0);
+    Date date = ISO_8601_BASE.parse(xmlDateTime, position);
+    if (date == null) {
+      throw new IllegalArgumentException("Invalid XML dateTime value: " + xmlDateTime 
+          + " (at position " + position.getErrorIndex() + ")"); }
+
+    // Parse the date time extras
+    Matcher matcher = ISO_8601_EXTRAS.matcher(xmlDateTime.substring(position.getIndex()));
     if (!matcher.matches()) {
-      // This will match even an empty string as all groups are optional,
+      // This will match even an empty string as all groups are optional. Thus a
-      // so a non-match means some other garbage was there
+      // non-match means invalid content.
-      throw new IllegalArgumentException("Invalid XML dateTime value: " + xmlTime);
+      throw new IllegalArgumentException("Invalid XML dateTime value: " + xmlDateTime);
     }
 
     long time = date.getTime();
@@ -175,7 +209,7 @@ public class StringUtils {
     // Account for fractional seconds
     String fractional = matcher.group(1);
     if (fractional != null) {
-      // Regex ensures fractional part is in (0,1(
+      // Regex ensures fractional part is in (0,1)
       float fractionalSeconds = Float.parseFloat(fractional);
       long fractionalMillis = (long) (fractionalSeconds * 1000.0f);
       time += fractionalMillis;
@@ -193,24 +227,28 @@ public class StringUtils {
 
       // Regex ensures values are >= 0
       if (offsetHours > 14 || offsetMins > 59) {
-        throw new IllegalArgumentException("Bad timezone in " + xmlTime);
+        throw new IllegalArgumentException("Bad timezone: " + xmlDateTime);
       }
 
       long totalOffsetMillis = (offsetMins + offsetHours * 60L) * 60000L;
 
-      // Make time go back to UTC
+      // Convert to UTC
       if (plusSign) {
         time -= totalOffsetMillis;
       } else {
         time += totalOffsetMillis;
       }
     }
-
     return time;
   }
 
   /**
-   * Gets the time as an array of parts.
+   * Gets the time as an array of three integers. Index 0 contains the number of
+   * seconds, index 1 contains the number of minutes, and index 2 contains the
+   * number of hours.
+   *
+   * @param time the time in milliseconds
+   * @return an array of 3 elements.
    */
   public static int[] getTimeParts(long time) {
     if (time < 0) {
@@ -224,10 +262,9 @@ public class StringUtils {
 
     long seconds = time / 1000;
     parts[0] = (int) (seconds % 60);
-    int tmp = (int) (seconds / 60);
+    int minutes = (int) (seconds / 60);
-    parts[1] = tmp % 60;
+    parts[1] = minutes % 60;
-    parts[2] = tmp / 60;
+    parts[2] = minutes / 60;
-
     return parts;
   }
 }

MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java

@@ -26,7 +26,6 @@ import com.google.android.apps.mytracks.content.TracksColumns;
 import com.google.android.apps.mytracks.services.ControlRecordingService;
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
 
 import android.app.PendingIntent;
@@ -68,9 +67,6 @@ public class TrackWidgetProvider
   private MyTracksProviderUtils providerUtils;
   private Context context;
   private String unknown;
-  private String distanceLabel;
-  private String speedLabel;
-  private String paceLabel;
   private TrackObserver trackObserver;
   private boolean isMetric;
   private boolean reportSpeed;
@@ -213,32 +209,10 @@ public class TrackWidgetProvider
     }
 
     TripStatistics stats = track.getStatistics();
-
+    String distance = StringUtils.formatDistance(context, stats.getTotalDistance(), isMetric);
-    // TODO replace this with format strings and miles.
-    // convert meters to kilometers
-    double displayDistance = stats.getTotalDistance() * UnitConversions.M_TO_KM;
-    if (!isMetric) {
-      displayDistance *= UnitConversions.KM_TO_MI;
-    }
-    String distance =
-        StringUtils.formatSingleDecimalPlace(displayDistance) + " " + this.distanceLabel;
-
-    // convert ms to minutes
     String time = StringUtils.formatElapsedTime(stats.getMovingTime());
-    String speed = unknown;
+    String speed = StringUtils.formatSpeed(
-    if (!Double.isNaN(stats.getAverageMovingSpeed())) {
+        context, stats.getAverageMovingSpeed(), isMetric, reportSpeed);
-      // Convert m/s to km/h
-      double displaySpeed = stats.getAverageMovingSpeed() * UnitConversions.MS_TO_KMH;
-      if (!isMetric) {
-        displaySpeed *= UnitConversions.KM_TO_MI;
-      }
-      if (reportSpeed) {
-        speed = StringUtils.formatSingleDecimalPlace(displaySpeed) + " " + this.speedLabel;
-      } else {
-        long displayPace = (long) (3600000.0 / displaySpeed);
-        speed = StringUtils.formatElapsedTime(displayPace) + " " + paceLabel;
-      }
-    }
 
     views.setTextViewText(R.id.appwidget_distance_text, distance);
     views.setTextViewText(R.id.appwidget_time_text, time);
@@ -250,11 +224,6 @@ public class TrackWidgetProvider
     String metricUnitsKey = context.getString(R.string.metric_units_key);
     if (key == null || key.equals(metricUnitsKey)) {
       isMetric = prefs.getBoolean(metricUnitsKey, true);
-      distanceLabel = context.getString(isMetric ? R.string.unit_kilometer : R.string.unit_mile);
-      speedLabel = context.getString(
-          isMetric ? R.string.unit_kilometer_per_hour : R.string.unit_mile_per_hour);
-      paceLabel = context.getString(
-          isMetric ? R.string.unit_minute_per_kilometer : R.string.unit_minute_per_mile);
     }
 
     String reportSpeedKey = context.getString(R.string.report_speed_key);

MyTracksTest/src/com/google/android/apps/mytracks/io/file/TcxTrackWriterTest.java

@@ -1,9 +1,23 @@
-// Copyright 2010 Google Inc. All Rights Reserved.
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
 package com.google.android.apps.mytracks.io.file;
 
 import com.google.android.apps.mytracks.content.MyTracksLocation;
 import com.google.android.apps.mytracks.content.Sensor;
-import com.google.android.apps.mytracks.util.FileUtils;
+import com.google.android.apps.mytracks.util.StringUtils;
 
 import java.util.List;
 
@@ -11,7 +25,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 /**
- * Tests for the GPX track exporter.
+ * Tests for {@link TcxTrackWriter}.
  *
  * @author Sandor Dornbush
  */
@@ -37,42 +51,46 @@ public class TcxTrackWriterTest extends TrackFormatWriterTest {
   }
 
   /**
-   * Asserts that the given tags describe the given points, in the same order.
+   * Asserts that the given tags describe the given locations in the same order.
+   *
+   * @param tags list of tags
+   * @param locations list of locations
    */
-  private void assertTagsMatchPoints(List<Element> tags, MyTracksLocation... locs) {
+  private void assertTagsMatchPoints(List<Element> tags, MyTracksLocation... locations) {
-    assertEquals(locs.length, tags.size());
+    assertEquals(locations.length, tags.size());
-    for (int i = 0; i < locs.length; i++) {
+    for (int i = 0; i < locations.length; i++) {
-      Element tag = tags.get(i);
+      assertTagMatchesLocation(tags.get(i), locations[i]);
-      MyTracksLocation loc = locs[i];
-
-      assertTagMatchesLocation(tag, loc);
     }
   }
 
   /**
    * Asserts that the given tag describes the given location.
+   *
+   * @param tag the tag
+   * @param location the location
    */
-  private void assertTagMatchesLocation(Element tag, MyTracksLocation loc) {
+  private void assertTagMatchesLocation(Element tag, MyTracksLocation location) {
-    Element posTag = getChildElement(tag, "Position");
+    assertEquals(StringUtils.formatDateTimeIso8601(location.getTime()), getChildTextValue(tag, "Time"));
-    assertEquals(Double.toString(loc.getLatitude()),
-        getChildTextValue(posTag, "LatitudeDegrees"));
-    assertEquals(Double.toString(loc.getLongitude()),
-        getChildTextValue(posTag, "LongitudeDegrees"));
 
-    assertEquals(FileUtils.FILE_TIMESTAMP_FORMAT.format(loc.getTime()),
+    Element positionTag = getChildElement(tag, "Position");
-        getChildTextValue(tag, "Time"));
+    assertEquals(
-    assertEquals(Double.toString(loc.getAltitude()),
+        Double.toString(location.getLatitude()), getChildTextValue(positionTag, "LatitudeDegrees"));
-        getChildTextValue(tag, "AltitudeMeters"));
+    assertEquals(Double.toString(location.getLongitude()),
-    assertTrue(loc.getSensorDataSet() != null);
+        getChildTextValue(positionTag, "LongitudeDegrees"));
-    Sensor.SensorDataSet sds = loc.getSensorDataSet();
 
-    List<Element> bpm = getChildElements(tag, "HeartRateBpm", 1);
+    assertEquals(Double.toString(location.getAltitude()), getChildTextValue(tag, "AltitudeMeters"));
+    assertTrue(location.getSensorDataSet() != null);
+    Sensor.SensorDataSet sds = location.getSensorDataSet();
+
+    List<Element> heartRate = getChildElements(tag, "HeartRateBpm", 1);
     assertEquals(Integer.toString(sds.getHeartRate().getValue()),
-        getChildTextValue(bpm.get(0), "Value"));
+        getChildTextValue(heartRate.get(0), "Value"));
 
-    List<Element> ext = getChildElements(tag, "Extensions", 1);
+    List<Element> extensions = getChildElements(tag, "Extensions", 1);
-    List<Element> tpx = getChildElements(ext.get(0), "TPX", 1);
+    List<Element> tpx = getChildElements(extensions.get(0), "TPX", 1);
-    assertEquals(Integer.toString(sds.getPower().getValue()),
+    assertEquals(
-        getChildTextValue(tpx.get(0), "Watts"));
+        Integer.toString(sds.getCadence().getValue()), getChildTextValue(tpx.get(0), "RunCadence"));
+    assertEquals(
+        Integer.toString(sds.getPower().getValue()), getChildTextValue(tpx.get(0), "Watts"));
   }
 }

MyTracksTest/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesActivityTest.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks.io.fusiontables;
+
+import com.google.android.apps.mytracks.io.docs.SendDocsActivity;
+import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
+import com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity;
+
+import android.test.AndroidTestCase;
+
+/**
+ * Tests the {@link SendFusionTablesActivity}.
+ * 
+ * @author Youtao Liu
+ */
+public class SendFusionTablesActivityTest extends AndroidTestCase {
+
+  private SendFusionTablesActivity sendFusionTablesActivity;
+  private SendRequest sendRequest;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    sendRequest = new SendRequest(1L, true, false, true);
+    sendFusionTablesActivity = new SendFusionTablesActivity();
+  }
+
+  /**
+   * Tests the method
+   * {@link SendFusionTablesActivity#getNextClass(SendRequest, boolean)}. Sets
+   * the flags of "sendDocs" and "cancel" to false and false.
+   */
+  public void testGetNextClass_notCancelNotSendDocs() {
+    sendRequest.setSendDocs(false);
+    Class<?> next = sendFusionTablesActivity.getNextClass(sendRequest, false);
+    assertEquals(UploadResultActivity.class, next);
+  }
+
+  /**
+   * Tests the method
+   * {@link SendFusionTablesActivity#getNextClass(SendRequest, boolean)}. Sets
+   * the flags of "sendDocs" and "cancel" to true and false.
+   */
+  public void testGetNextClass_notCancelSendDocs() {
+    sendRequest.setSendDocs(true);
+    Class<?> next = sendFusionTablesActivity.getNextClass(sendRequest, false);
+    assertEquals(SendDocsActivity.class, next);
+  }
+
+  /**
+   * Tests the method
+   * {@link SendFusionTablesActivity#getNextClass(SendRequest,boolean)}. Sets
+   * the flags of "sendDocs" and "cancel" to true and true.
+   */
+  public void testGetNextClass_cancelSendDocs() {
+    sendRequest.setSendDocs(true);
+    Class<?> next = sendFusionTablesActivity.getNextClass(sendRequest, true);
+    assertEquals(UploadResultActivity.class, next);
+  }
+
+  /**
+   * Tests the method
+   * {@link SendFusionTablesActivity#getNextClass(SendRequest,boolean)}. Sets
+   * the flags of "sendDocs" and "cancel" to false and true.
+   */
+  public void testGetNextClass_cancelNotSendDocs() {
+    sendRequest.setSendDocs(false);
+    Class<?> next = sendFusionTablesActivity.getNextClass(sendRequest, true);
+    assertEquals(UploadResultActivity.class, next);
+  }
+
+}

MyTracksTest/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivityTest.java

@@ -0,0 +1,146 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks.io.maps;
+
+import com.google.android.apps.mytracks.io.gdata.maps.MapsMapMetadata;
+import com.google.android.maps.mytracks.R;
+
+import android.content.Intent;
+import android.test.AndroidTestCase;
+import android.widget.ArrayAdapter;
+
+import java.util.ArrayList;
+
+/**
+ * Tests the {@link ChooseMapActivity}.
+ * 
+ * @author Youtao Liu
+ */
+public class ChooseMapActivityTest extends AndroidTestCase {
+
+  private static final String MAP_ID = "mapid";
+  private static final String MAP_TITLE = "title";
+  private static final String MAP_DESC = "desc";
+
+  private ArrayList<String> mapIds = new ArrayList<String>();
+  private ArrayList<MapsMapMetadata> mapDatas = new ArrayList<MapsMapMetadata>();
+  private boolean errorDialogShown = false;
+  private boolean progressDialogRemoved = false;
+
+  /**
+   * Creates a class to override some methods of {@link ChooseMapActivity} to
+   * makes it testable.
+   * 
+   * @author youtaol
+   */
+  public class ChooseMapActivityMock extends ChooseMapActivity {
+    /**
+     * By overriding this method, avoids to start next activity.
+     */
+    @Override
+    public void startActivity(Intent intent) {}
+
+    /**
+     * By overriding this method, avoids to show an error dialog and set the
+     * show flag to true.
+     */
+    @Override
+    public void showErrorDialog() {
+      errorDialogShown = true;
+    }
+    
+    /**
+     * By overriding this method, avoids to show an error dialog and set the
+     * show flag to true.
+     */
+    @Override
+    public void removeProgressDialog() {
+      progressDialogRemoved = true;
+    }
+  }
+
+  /**
+   * Tests the method
+   * {@link ChooseMapActivity#onAsyncTaskCompleted(boolean, ArrayList, ArrayList)}
+   * . An alert dialog should be shown when there is no map.
+   * 
+   * @throws InterruptedException
+   */
+  public void testOnAsyncTaskCompleted_fail() {
+    ChooseMapActivityMock chooseMapActivityMock = new ChooseMapActivityMock();
+    errorDialogShown = false;
+    progressDialogRemoved = false;
+    chooseMapActivityMock.onAsyncTaskCompleted(false, null, null);
+    assertTrue(progressDialogRemoved);
+    assertTrue(errorDialogShown);
+  }
+
+  /**
+   * Tests the method
+   * {@link ChooseMapActivity#onAsyncTaskCompleted(boolean, ArrayList, ArrayList)}
+   * . Check the logic when there is only map.
+   */
+  public void testOnAsyncTaskCompleted_success_oneMap() {
+    ChooseMapActivityMock chooseMapActivityMock = new ChooseMapActivityMock();
+    chooseMapActivityMock.arrayAdapter = new ArrayAdapter<ChooseMapActivity.ListItem>(getContext(),
+        R.layout.choose_map_item);
+    simulateMaps(1);
+    chooseMapActivityMock.onAsyncTaskCompleted(true, mapIds, mapDatas);
+    assertEquals(1, chooseMapActivityMock.arrayAdapter.getCount());
+    assertEquals(MAP_ID + "0", chooseMapActivityMock.arrayAdapter.getItem(0).getMapId());
+    assertEquals(MAP_TITLE + "0", chooseMapActivityMock.arrayAdapter.getItem(0).getMapData()
+        .getTitle());
+    assertEquals(MAP_DESC + "0", chooseMapActivityMock.arrayAdapter.getItem(0).getMapData()
+        .getDescription());
+  }
+
+  /**
+   * Tests the method
+   * {@link ChooseMapActivity#onAsyncTaskCompleted(boolean, ArrayList, ArrayList)}
+   * . Check the logic when there are 10 maps.
+   */
+  public void testOnAsyncTaskCompleted_success_twoMaps() {
+    ChooseMapActivityMock chooseMapActivityMock = new ChooseMapActivityMock();
+    chooseMapActivityMock.arrayAdapter = new ArrayAdapter<ChooseMapActivity.ListItem>(getContext(),
+        R.layout.choose_map_item);
+    simulateMaps(10);
+    chooseMapActivityMock.onAsyncTaskCompleted(true, mapIds, mapDatas);
+    assertEquals(10, chooseMapActivityMock.arrayAdapter.getCount());
+    assertEquals(MAP_ID + "9", chooseMapActivityMock.arrayAdapter.getItem(9).getMapId());
+    assertEquals(MAP_TITLE + "9", chooseMapActivityMock.arrayAdapter.getItem(9).getMapData()
+        .getTitle());
+    assertEquals(MAP_DESC + "9", chooseMapActivityMock.arrayAdapter.getItem(9).getMapData()
+        .getDescription());
+  }
+
+  /**
+   * Simulates map data for the test.
+   * 
+   * @param number of data should be simulated.
+   */
+  private void simulateMaps(int number) {
+    mapIds = new ArrayList<String>();
+    mapDatas = new ArrayList<MapsMapMetadata>();
+    for (int i = 0; i < number; i++) {
+      mapIds.add(MAP_ID + i);
+      MapsMapMetadata metaData = new MapsMapMetadata();
+      metaData.setTitle(MAP_TITLE + i);
+      metaData.setDescription(MAP_DESC + i);
+      metaData.setSearchable(true);
+      mapDatas.add(metaData);
+    }
+  }
+}

MyTracksTest/src/com/google/android/apps/mytracks/io/maps/SendMapsActivityTest.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks.io.maps;
+
+import com.google.android.apps.mytracks.io.docs.SendDocsActivity;
+import com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity;
+import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
+import com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity;
+
+import android.test.AndroidTestCase;
+
+/**
+ * Tests the {@link SendMapsActivity}.
+ * 
+ * @author Youtao Liu
+ */
+public class SendMapsActivityTest extends AndroidTestCase {
+
+  private SendMapsActivity sendMapsActivity;
+  private SendRequest sendRequest;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    sendRequest = new SendRequest(1L, true, false, true);
+    sendMapsActivity = new SendMapsActivity();
+  }
+
+  /**
+   * Tests the method
+   * {@link SendMapsActivity#getNextClass(SendRequest, boolean)}. Sets the flags
+   * of "sendFusionTables","sendDocs" and "cancel" to true, true and false.
+   */
+  public void testGetNextClass_notCancelSendFusionTables() {
+    sendRequest.setSendFusionTables(true);
+    sendRequest.setSendDocs(true);
+    Class<?> next = sendMapsActivity.getNextClass(sendRequest, false);
+    assertEquals(SendFusionTablesActivity.class, next);
+  }
+
+  /**
+   * Tests the method
+   * {@link SendMapsActivity#getNextClass(SendRequest, boolean)}. Sets the flags
+   * of "sendFusionTables","sendDocs" and "cancel" to false, true and false.
+  */
+  public void testGetNextClass_notCancelSendDocs() {
+    sendRequest.setSendFusionTables(false);
+    sendRequest.setSendDocs(true);
+    Class<?> next = sendMapsActivity.getNextClass(sendRequest, false);
+    assertEquals(SendDocsActivity.class, next);
+  }
+  
+  /**
+   * Tests the method
+   * {@link SendMapsActivity#getNextClass(SendRequest, boolean)}. Sets the flags
+   * of "sendFusionTables","sendDocs" and "cancel" to false, false and false.
+   */
+  public void testGetNextClass_notCancelNotSend() {
+    sendRequest.setSendFusionTables(false);
+    sendRequest.setSendDocs(false);
+    Class<?> next = sendMapsActivity.getNextClass(sendRequest, false);
+    assertEquals(UploadResultActivity.class, next);
+  }
+
+  /**
+   * Tests the method
+   * {@link SendMapsActivity#getNextClass(SendRequest, boolean)}. Sets the flags
+   * of "sendFusionTables","sendDocs" and "cancel" to true, true and true.
+   */
+  public void testGetNextClass_cancelSendDocs() {
+    sendRequest.setSendFusionTables(true);
+    sendRequest.setSendDocs(true);
+    Class<?> next = sendMapsActivity.getNextClass(sendRequest, true);
+    assertEquals(UploadResultActivity.class, next);
+  }
+
+}

MyTracksTest/src/com/google/android/apps/mytracks/util/StringUtilsTest.java

@@ -15,68 +15,217 @@
  */
 package com.google.android.apps.mytracks.util;
 
+import android.test.AndroidTestCase;
+
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
-import junit.framework.TestCase;
-
 /**
  * Tests for {@link StringUtils}.
  *
  * @author Rodrigo Damazio
  */
-public class StringUtilsTest extends TestCase {
+public class StringUtilsTest extends AndroidTestCase {
-  public void testParseXmlDateTime() {
+
-    assertParseXmlDateTime("2010-05-04T03:02:01",
+  /**
-        2010, 5, 4, 3, 2, 1, 0);
+   * Tests {@link StringUtils#formatDateTime(android.content.Context, long)}.
+   */
+  public void testFormatTime() {
+    // Unix time 0 in UTC is "4:00 PM" in Pacific Standard time zone.
+    // This test can break if run on a different time zone or with a different
+    // time format preference.
+    assertEquals("4:00 PM", StringUtils.formatTime(getContext(), 0L));
   }
 
-  public void testParseXmlDateTime_fractional() {
+  /**
-    assertParseXmlDateTime("2010-05-04T03:02:01.3",
+   * Tests {@link StringUtils#formatDateTime(android.content.Context, long)}.
-        2010, 5, 4, 3, 2, 1, 300);
+   */
-    assertParseXmlDateTime("2010-05-04T03:02:01.35",
+  public void testFormatDateTime() {
-        2010, 5, 4, 3, 2, 1, 350);
+    // Unix time 0 in UTC is "12/31/1969 4:00 PM" in Pacific Standard time zone.
-    assertParseXmlDateTime("2010-05-04T03:02:01.352",
+    // This test can break if run on a different time zone or with a different
-        2010, 5, 4, 3, 2, 1, 352);
+    // date/time format preference.
-    assertParseXmlDateTime("2010-05-04T03:02:01.3525",
+    assertEquals("12/31/1969 4:00 PM", StringUtils.formatDateTime(getContext(), 0L));
-        2010, 5, 4, 3, 2, 1, 352);
+  }
+  
+  /**
+   * Tests {@link StringUtils#formatDateTimeIso8601(long)}.
+   */
+  public void testFormatDateTimeIso8601() {
+    assertEquals("1970-01-01T00:00:12.345Z", StringUtils.formatDateTimeIso8601(12345));
   }
 
-  public void testParseXmlDateTime_timezone() {
+  /**
-    assertParseXmlDateTime("2010-05-04T03:02:01Z",
+   * Tests {@link StringUtils#formatElapsedTime(long)}.
-        2010, 5, 4, 3, 2, 1, 0);
+   */
-    assertParseXmlDateTime("2010-05-04T03:02:01+00:00",
+  public void testformatElapsedTime() {
-        2010, 5, 4, 3, 2, 1, 0);
+    // 1 second
-    assertParseXmlDateTime("2010-05-04T03:02:01-00:00",
+    assertEquals("00:01", StringUtils.formatElapsedTime(1000));
-        2010, 5, 4, 3, 2, 1, 0);
+    // 10 seconds
-    assertParseXmlDateTime("2010-05-04T03:02:01+01:00",
+    assertEquals("00:10", StringUtils.formatElapsedTime(10000));
-        2010, 5, 4, 2, 2, 1, 0);
+    // 1 minute
-    assertParseXmlDateTime("2010-05-04T03:02:01+10:30",
+    assertEquals("01:00", StringUtils.formatElapsedTime(60000));
-        2010, 5, 3, 16, 32, 1, 0);
+    // 10 minutes
-    assertParseXmlDateTime("2010-05-04T03:02:01-09:30",
+    assertEquals("10:00", StringUtils.formatElapsedTime(600000));
-        2010, 5, 4, 12, 32, 1, 0);
+    // 1 hour
-    assertParseXmlDateTime("2010-05-04T03:02:01-05:00",
+    assertEquals("1:00:00", StringUtils.formatElapsedTime(3600000));
-        2010, 5, 4, 8, 2, 1, 0);
+    // 10 hours
+    assertEquals("10:00:00", StringUtils.formatElapsedTime(36000000));
+    // 100 hours
+    assertEquals("100:00:00", StringUtils.formatElapsedTime(360000000));
   }
 
-  public void testParseXmlDateTime_fractionalAndTimezone() {
+  /**
-    assertParseXmlDateTime("2010-05-04T03:02:01.352Z",
+   * Tests {@link StringUtils#formatElapsedTimeWithHour(long)}.
-        2010, 5, 4, 3, 2, 1, 352);
+   */
-    assertParseXmlDateTime("2010-05-04T03:02:01.47+00:00",
+  public void testformatElapsedTimeWithHour() {
-        2010, 5, 4, 3, 2, 1, 470);
+    // 1 second
-    assertParseXmlDateTime("2010-05-04T03:02:01.5791+03:00",
+    assertEquals("0:00:01", StringUtils.formatElapsedTimeWithHour(1000));
-        2010, 5, 4, 0, 2, 1, 579);
+    // 10 seconds
-    assertParseXmlDateTime("2010-05-04T03:02:01.8-05:30",
+    assertEquals("0:00:10", StringUtils.formatElapsedTimeWithHour(10000));
-        2010, 5, 4, 8, 32, 1, 800);
+    // 1 minute
+    assertEquals("0:01:00", StringUtils.formatElapsedTimeWithHour(60000));
+    // 10 minutes
+    assertEquals("0:10:00", StringUtils.formatElapsedTimeWithHour(600000));
+    // 1 hour
+    assertEquals("1:00:00", StringUtils.formatElapsedTimeWithHour(3600000));
+    // 10 hours
+    assertEquals("10:00:00", StringUtils.formatElapsedTimeWithHour(36000000));
+    // 100 hours
+    assertEquals("100:00:00", StringUtils.formatElapsedTimeWithHour(360000000));
   }
 
-  private void assertParseXmlDateTime(String dateTime,
+  /**
-      int year, int month, int day, int hour, int min, int second, int millis) {
+   * Tests {@link StringUtils#formatDistance(android.content.Context, double,
-    long timestamp = StringUtils.parseXmlDateTime(dateTime);
+   * boolean)}.
-    GregorianCalendar calendar =
+   */
-        new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+  public void testFormatDistance() {
-    calendar.set(year, month - 1, day, hour, min, second);
+    // A large number in metric
-    calendar.set(GregorianCalendar.MILLISECOND, millis);
+    assertEquals("5.00 km", StringUtils.formatDistance(getContext(), 5000, true));
-    assertEquals(calendar.getTimeInMillis(), timestamp);
+    // A large number in imperial
+    assertEquals("3.11 mi", StringUtils.formatDistance(getContext(), 5000, false));
+    // A small number in metric
+    assertEquals("100.00 m", StringUtils.formatDistance(getContext(), 100, true));
+    // A small number in imperial
+    assertEquals("328.08 ft", StringUtils.formatDistance(getContext(), 100, false));
+  }
+
+  /**
+   * Tests {@link StringUtils#formatSpeed(android.content.Context, double,
+   * boolean, boolean)}.
+   */
+  public void testFormatSpeed() {
+    // Speed in metric
+    assertEquals("36.00 km/h", StringUtils.formatSpeed(getContext(), 10, true, true));
+    // Speed in imperial
+    assertEquals("22.37 mi/h", StringUtils.formatSpeed(getContext(), 10, false, true));
+    // Pace in metric
+    assertEquals("1.67 min/km", StringUtils.formatSpeed(getContext(), 10, true, false));
+    // Pace in imperial
+    assertEquals("2.68 min/mi", StringUtils.formatSpeed(getContext(), 10, false, false));
+    // zero pace
+    assertEquals("0.00 min/km", StringUtils.formatSpeed(getContext(), 0, true, false));
+    assertEquals("0.00 min/mi", StringUtils.formatSpeed(getContext(), 0, false, false));
+    // speed is NaN
+    assertEquals("-", StringUtils.formatSpeed(getContext(), Double.NaN, true, true));
+    // speed is infinite
+    assertEquals("-", StringUtils.formatSpeed(getContext(), Double.NEGATIVE_INFINITY, true, true));
+  }
+
+  /**
+   * Tests {@link StringUtils#formatTimeDistance(android.content.Context, long, double, boolean)}.
+   */
+  public void testFormatTimeDistance() {
+    assertEquals("00:10 5.00 km", StringUtils.formatTimeDistance(getContext(), 10000, 5000, true));
+  }
+  
+  /**
+   * Tests {@link StringUtils#formatCData(String)}.
+   */
+  public void testFormatCData() {
+    assertEquals("<![CDATA[hello]]>", StringUtils.formatCData("hello"));
+    assertEquals("<![CDATA[hello]]]]><![CDATA[>there]]>", StringUtils.formatCData("hello]]>there"));
+  }
+  
+  /**
+   * Tests {@link StringUtils#getTime(String)}.
+   */
+  public void testGetTime() {
+    assertGetTime("2010-05-04T03:02:01", 2010, 5, 4, 3, 2, 1, 0);
+    assertGetTime("2010-05-04T03:02:01Z", 2010, 5, 4, 3, 2, 1, 0);
+  }
+
+  /**
+   * Tests {@link StringUtils#getTime(String)} with fractional seconds.
+   */
+  public void testGetTime_fractional() {
+    assertGetTime("2010-05-04T03:02:01.3", 2010, 5, 4, 3, 2, 1, 300);
+    assertGetTime("2010-05-04T03:02:01.35", 2010, 5, 4, 3, 2, 1, 350);
+    assertGetTime("2010-05-04T03:02:01.352Z", 2010, 5, 4, 3, 2, 1, 352);
+    assertGetTime("2010-05-04T03:02:01.3525Z", 2010, 5, 4, 3, 2, 1, 352);
+  }
+
+  /**
+   * Tests {@link StringUtils#getTime(String)} with time zone.
+   */
+  public void testGetTime_timezone() {
+    assertGetTime("2010-05-04T03:02:01Z", 2010, 5, 4, 3, 2, 1, 0);
+    assertGetTime("2010-05-04T03:02:01+00:00", 2010, 5, 4, 3, 2, 1, 0);
+    assertGetTime("2010-05-04T03:02:01-00:00", 2010, 5, 4, 3, 2, 1, 0);
+    assertGetTime("2010-05-04T03:02:01+01:00", 2010, 5, 4, 2, 2, 1, 0);
+    assertGetTime("2010-05-04T03:02:01+10:30", 2010, 5, 3, 16, 32, 1, 0);
+    assertGetTime("2010-05-04T03:02:01-09:30", 2010, 5, 4, 12, 32, 1, 0);
+    assertGetTime("2010-05-04T03:02:01-05:00", 2010, 5, 4, 8, 2, 1, 0);
+  }
+
+  /**
+   * Tests {@link StringUtils#getTime(String)} with fractional seconds and time
+   * zone.
+   */
+  public void testGetTime_fractionalAndTimezone() {
+    assertGetTime("2010-05-04T03:02:01.352Z", 2010, 5, 4, 3, 2, 1, 352);
+    assertGetTime("2010-05-04T03:02:01.47+00:00", 2010, 5, 4, 3, 2, 1, 470);
+    assertGetTime("2010-05-04T03:02:01.5791+03:00", 2010, 5, 4, 0, 2, 1, 579);
+    assertGetTime("2010-05-04T03:02:01.8-05:30", 2010, 5, 4, 8, 32, 1, 800);
+  }
+
+  /**
+   * Asserts the {@link StringUtils#getTime(String)} returns the expected
+   * values.
+   *
+   * @param xmlDateTime the xml date time string
+   * @param year the expected year
+   * @param month the expected month
+   * @param day the expected day
+   * @param hour the expected hour
+   * @param minute the expected minute
+   * @param second the expected second
+   * @param millisecond the expected milliseconds
+   */
+  private void assertGetTime(String xmlDateTime, int year, int month, int day, int hour, int minute,
+      int second, int millisecond) {
+    GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+    calendar.set(year, month - 1, day, hour, minute, second);
+    calendar.set(GregorianCalendar.MILLISECOND, millisecond);
+    assertEquals(calendar.getTimeInMillis(), StringUtils.getTime(xmlDateTime));
+  }
+
+  /**
+   * Tests {@link StringUtils#getTimeParts(long)} with a positive number.
+   */
+  public void testGetTimeParts_postive() {
+    int parts[] = StringUtils.getTimeParts(61000);
+    assertEquals(1, parts[0]);
+    assertEquals(1, parts[1]);
+    assertEquals(0, parts[2]);
+  }
+
+  /**
+   * Tests {@link StringUtils#getTimeParts(long)} with a negative number.
+   */
+  public void testGetTimeParts_negative() {
+    int parts[] = StringUtils.getTimeParts(-61000);
+    assertEquals(-1, parts[0]);
+    assertEquals(-1, parts[1]);
+    assertEquals(0, parts[2]);
   }
 }