update manifest for version 1.1.15

auth token type.

MyTracks/AndroidManifest.xml

@@ -17,8 +17,8 @@ limitations under the License.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.maps.mytracks"
           android:installLocation="auto"
-          android:versionCode="39"
-          android:versionName="1.1.16">
+          android:versionCode="38"
+          android:versionName="1.1.15">
 
   <!-- Permissions to initialize service -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -293,7 +293,6 @@ limitations under the License.
 
     <service android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
              android:exported="false" />
-    <service android:name="com.google.android.apps.mytracks.services.RemoveTempFilesService"/>
 
     <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
       <intent-filter>

MyTracks/res/values/do_not_translate.xml

@@ -35,12 +35,12 @@ limitations under the License.
     http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png
   </string>
   <string name="my_tracks_analytics_id">UA-7222692-2</string> 
-  <string name="my_tracks_privacy_url">www.google.com/policies/privacy/</string>
+  <string name="my_tracks_privacy_url">m.google.com/privacy</string>
   <string name="my_tracks_recording_service_name">My Tracks Recording Service</string>
   <string name="my_tracks_support_url">
     groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks
   </string>
-  <string name="my_tracks_web_url">www.google.com/mobile/mytracks</string>
+  <string name="my_tracks_web_url">mytracks.appspot.com</string>
   <string name="permission_notification_value">
     com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS
   </string>

MyTracks/res/values/strings.xml

@@ -465,166 +465,6 @@ limitations under the License.
     Y axis
   </string>
 
-  <!-- Description -->
-  <string name="description_activity_type"
-    translation_description="Activity type description.
-    
-      %1$s activity type. E.g., 'hiking'">
-    Activity type: %1$s
-  </string>
-  <string name="description_average_moving_pace"
-    translation_description="Average moving pace description.
-
-      %1$.2f pace in minutes per kilometer
-      %2$.1f pace in minutes per mile">
-    Average moving pace: %1$.2f min/km (%2$.1f min/mi)
-  </string>
-  <string name="description_average_moving_speed"
-    translation_description="Average moving speed description.
-
-      %1$.2f speed in kilometers per hour
-      %2$.1f speed in miles per hour">    
-    Average moving speed: %1$.2f km/h (%2$.1f mi/h)
-  </string>
-  <string name="description_average_pace"
-    translation_description="Average pace description.
-
-      %1$.2f pace in minutes per kilometer
-      %2$.1f pace in minutes per mile">
-    Average pace: %1$.2f min/km (%2$.1f min/mi)
-  </string>
-  <string name="description_average_speed"
-    translation_description="Average speed description.
-
-      %1$.2f speed in kilometers per hour
-      %2$.1f speed in miles per hour">
-    Average speed: %1$.2f km/h (%2$.1f mi/h)
-  </string>
-  <string name="description_elevation_gain"
-    translation_description="Elevation gain description.
-    
-      %1$d elevation in meters
-      %2$d elevation in feet">
-    Elevation gain: %1$d m (%2$d ft)
-  </string>
-  <string name="description_location_accuracy"
-    translation_description="Label for location accuracy in meters.">
-    Accuracy (m)
-  </string>
-  <string name="description_location_altitude"
-    translation_description="Label for location altitude in degrees.">
-    Altitude (m)
-  </string>
-  <string name="description_location_bearing"
-    translation_description="Label for location bearing in degrees.">
-    Bearing (deg)
-  </string>
-  <string name="description_location_latitude"
-    translation_description="Label for location latitude in degrees.">
-    Latitude (deg)
-  </string>
-  <string name="description_location_longitude"
-    translation_description="Label for location longitude in degrees.">
-    Longitude (deg)
-  </string>
-  <string name="description_location_speed"
-    translation_description="Label for location speed in meters per second.">
-    Speed (m/s)
-  </string>
-  <string name="description_location_time"
-    translation_description="Label for location time.">
-    Time
-  </string>
-  <string name="description_max_elevation"
-    translation_description="Max elevation description.
-    
-      %1$d elevation in meters
-      %2$d elevation in feet">
-    Max elevation: %1$d m (%2$d ft)
-  </string>
-  <string name="description_max_grade"
-    translation_description="Max grade description.
-    
-      %1$d grade in percentage">
-    Max grade: %1$d %%
-  </string>
-  <string name="description_max_speed"
-    translation_description="Max speed description.
-
-      %1$.2f speed in kilometers per hour
-      %2$.1f speed in miles per hour">
-    Max speed: %1$.2f km/h (%2$.1f mi/h)
-  </string>
-  <string name="description_min_elevation"
-    translation_description="Min elevation description.
-    
-      %1$d elevation in meters
-      %2$d elevation in feet">
-    Min elevation: %1$d m (%2$d ft)
-  </string>
-  <string name="description_min_grade"
-    translation_description="Min grade description.
-    
-      %1$d grade in percentage">
-    Min grade: %1$d %%
-  </string>
-  <string name="description_min_pace"
-    translation_description="Min pace description.
-
-      %1$.2f pace in minutes per kilometer
-      %2$.1f pace in minutes per mile">
-    Min pace: %1$.2f min/km (%2$.1f min/mi)
-  </string>
-  <string name="description_moving_time"
-    translation_description="Moving time description.
-    
-      %1$s time. E.g., '1:08:59'">
-    Moving time: %1$s
-  </string>
-  <string name="description_recorded_time"
-    translation_description="Recorded time description.
-      
-      %1$s time. E.g, '2/15/2012 1:40 PM'">
-    Recorded: %1$s
-  </string>
-  <string name="description_sensor_battery_level"
-    translation_description="Label for battery level with its unit percentage (%).">
-    Battery level (%)
-  </string>
-  <string name="description_sensor_cadence"
-    translation_description="Label for cadence with its unit revolutions per minute (rpm).">
-    Cadence (rpm)
-  </string>
-  <string name="description_sensor_heart_rate"
-    translation_description="Label for heart rate with its unit beats per minute (bpm).">
-    Heart rate (bpm)
-  </string>
-  <string name="description_sensor_power"
-    translation_description="Label for power with its unit watt (W).">
-    Power (W)
-  </string>
-  <string name="description_track_point"
-    translation_description="Label for a track point">
-    Point
-  </string>
-  <string name="description_track_segment"
-    translation_description="Label for a track segment">
-    Segment
-  </string>
-  <string name="description_total_distance"
-    translation_description="Total distance description.
-      
-      %1$.2f distance in kilometers
-      %2$.1f distance in miles">
-    Total distance: %1$.2f km (%2$.1f mi)
-  </string>
-  <string name="description_total_time"
-    translation_description="Total time description.
-  
-      %1$s time. E.g., '1:08:59'">
-    Total time: %1$s
-  </string>
-
   <!-- EULA -->
   <string name="eula_accept"
     translation_description="In the 'Terms of service' dialog, the button to accept.
@@ -1259,7 +1099,7 @@ limitations under the License.
   <string name="search_global_description"
     translation_description="Description of what is searched in My Tracks, to be displayed in the
       global system search settings.">
-    Tracks and waypoints
+    My Tracks tracks and waypoints
   </string>
   <string name="search_hint"
     translation_description="The hint shown on the search box until the user types a search query.
@@ -1350,6 +1190,11 @@ limitations under the License.
       %1$s: service name. 'Google Maps', 'Google Fusion Tables', or 'Google Docs'.">
     Sending to %1$s. Please wait...
   </string>
+  <string name="send_google_recorded"
+    translation_description="When sending a track to Google, in the track description, a tag
+      for the track recorded date. E.g., 'Recorded: Tue Sep 06 15:08:30 PDT 2011'.">
+    Recorded
+  </string>
   <string name="send_google_result_header"
     translation_description="When sending a track to Google, the header on the top of the result
       page.
@@ -2429,16 +2274,6 @@ limitations under the License.
       Screenshot: track_list.png">
     Pick a track. Press &amp; hold for more options.
   </string>
-  <string name="track_list_play"
-    translation_description="In the context menu for a track, the menu option to play the track.">
-    Play
-  </string>
-  <string name="track_list_play_install_earth_message"
-    translation_description="After pressing the menu option to play a track, the message informing
-      the user that he needs Google Earth to play the track and asking him if he wants to install
-      Google Earth from the Android Market.">
-    You need Google Earth to play the track. Do you want to install from the Market?
-  </string>
   <string name="track_list_save_file"
     translation_description="In the context menu for a track, under the 'Save to SD card...'
       option, the menu option to save the track as a certain file format.
@@ -2596,53 +2431,13 @@ limitations under the License.
       Screenshot: value_auto_resume.png">
     Always
   </string>
-  <string name="value_float_feet"
-    translation_description="Display a float value in feet (ft).
-
-      %1$.2f: a float number. E.g., '2.22'">
-    %1$.2f ft
-  </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).
+    translation_description="In a setting picker, the string format to 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
+      %1$.1f: a float number. E.g., '2.2'
+      Screenshot: value_gps_accuracy_mile_poor_gps.png">
+    %1$.1f 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/dsi/ant/AntInterface.java

@@ -79,8 +79,10 @@ public class AntInterface {
     private static boolean mAntSupported = false;
 
     /**
-     * An interface for notifying AntInterface IPC clients when they have been
-     * connected to the ANT service.
+     * An interface for notifying AntInterface IPC clients when they have
+     * been connected to the ANT service.
+     *
+     * @see ServiceEvent
      */
     public interface ServiceListener
     {
@@ -1044,6 +1046,8 @@ public class AntInterface {
      *
      * @param channelNumber Which channel to transmit on.
      * @param txBuffer The data to send.
+     * @param initialPacket Which packet in the burst sequence does the data begin in, 1 is the first.
+     * @param containsEndOfBurst Is this the last of the data to be sent in burst.
      * @return The number of bytes still to be sent (approximately).  0 if success.
      * @throws AntInterfaceException
      * @throws AntServiceNotConnectedException
@@ -1209,7 +1213,7 @@ public class AntInterface {
      * Claims the interface if it is available.  If not the user will be prompted (on the notification bar) if a force claim should be done.
      * If the ANT Interface is claimed, an AntInterfaceIntent.ANT_INTERFACE_CLAIMED_ACTION intent will be sent, with the current applications pid.
      *
-     * @param appName The name if this application, to show to the user.
+     * @param String appName The name if this application, to show to the user.
      * @returns false if a claim interface request notification already exists.
      * @throws IllegalArgumentException
      * @throws AntInterfaceException

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

@@ -19,7 +19,6 @@ import static android.content.Intent.ACTION_BOOT_COMPLETED;
 import static com.google.android.apps.mytracks.Constants.RESUME_TRACK_EXTRA_NAME;
 import static com.google.android.apps.mytracks.Constants.TAG;
 
-import com.google.android.apps.mytracks.services.RemoveTempFilesService;
 import com.google.android.apps.mytracks.services.TrackRecordingService;
 
 import android.content.BroadcastReceiver;
@@ -51,9 +50,6 @@ public class BootReceiver extends BroadcastReceiver {
       Intent startIntent = new Intent(context, TrackRecordingService.class);
       startIntent.putExtra(RESUME_TRACK_EXTRA_NAME, true);
       context.startService(startIntent);
-
-      Intent removeTempFilesIntent = new Intent(context, RemoveTempFilesService.class);
-      context.startService(removeTempFilesIntent);
     } else {
       Log.w(TAG, "BootReceiver: unsupported action");
     }

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

@@ -31,7 +31,6 @@ import com.google.android.apps.mytracks.stats.TripStatisticsBuilder;
 import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
-import com.google.common.annotations.VisibleForTesting;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -259,8 +258,7 @@ public class ChartActivity extends Activity implements TrackDataListener {
    * @param location the location to get data for (this method takes ownership of that location)
    * @param result the resulting point to fill out
    */
-  @VisibleForTesting
-  void fillDataPoint(Location location, double result[]) {
+  private void fillDataPoint(Location location, double result[]) {
     double timeOrDistance = Double.NaN,
            elevation = Double.NaN,
            speed = Double.NaN,
@@ -292,6 +290,7 @@ public class ChartActivity extends Activity implements TrackDataListener {
     Mode mode = chartView.getMode();
     switch (mode) {
       case BY_DISTANCE:
+        timeOrDistance = profileLength / 1000.0;
         if (lastLocation != null) {
           double d = lastLocation.distanceTo(location);
           if (metricUnits) {
@@ -300,7 +299,6 @@ public class ChartActivity extends Activity implements TrackDataListener {
             profileLength += d * UnitConversions.KM_TO_MI;
           }
         }
-        timeOrDistance = profileLength * UnitConversions.M_TO_KM;
         break;
       case BY_TIME:
         if (startTime == -1) {
@@ -328,7 +326,7 @@ public class ChartActivity extends Activity implements TrackDataListener {
         && (location.getSpeed() <= trackMaxSpeed)) {
       speedBuffer.setNext(location.getSpeed());
     }
-    speed = speedBuffer.getAverage() * UnitConversions.MS_TO_KMH;
+    speed = speedBuffer.getAverage() * 3.6;
     if (!metricUnits) {
       speed *= UnitConversions.KM_TO_MI;
     }
@@ -480,19 +478,4 @@ public class ChartActivity extends Activity implements TrackDataListener {
     });
     return true;
   }
-  
-  @VisibleForTesting
-  ChartView getChartView() {
-    return chartView;
-  }
-
-  @VisibleForTesting
-  MenuItem getChartSettingsMenuItem() {
-    return chartSettingsMenuItem;
-  }
-  
-  @VisibleForTesting
-  void setTrackMaxSpeed(double maxSpeed) {
-    trackMaxSpeed = maxSpeed;
-  }
 }

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

@@ -21,7 +21,6 @@ import com.google.android.apps.mytracks.stats.ExtremityMonitor;
 import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
-import com.google.common.annotations.VisibleForTesting;
 
 import android.content.Context;
 import android.content.Intent;
@@ -408,12 +407,11 @@ public class ChartView extends View {
   }
 
   private int getWaypointX(Waypoint waypoint) {
-    if (mode == Mode.BY_DISTANCE) {
-      double lenghtInKm = waypoint.getLength() * UnitConversions.M_TO_KM;
-      return getX(metricUnits ? lenghtInKm : lenghtInKm * UnitConversions.KM_TO_MI);
-    } else {
-      return getX(waypoint.getDuration());
-    }
+    return (mode == Mode.BY_DISTANCE)
+        ? getX(metricUnits
+               ? waypoint.getLength() / 1000.0
+               : waypoint.getLength() * UnitConversions.KM_TO_MI / 1000.0)
+        : getX(waypoint.getDuration());
   }
 
   /**
@@ -886,14 +884,4 @@ public class ChartView extends View {
   public void setChartValueSeriesEnabled(int index, boolean enabled) {
     series[index].setEnabled(enabled);
   }
-  
-  @VisibleForTesting
-  int getZoomLevel() {
-    return zoomLevel;
-  }
-  
-  @VisibleForTesting
-  int getMaxZoomLevel() {
-    return maxZoomLevel;
-  }
 }

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

@@ -57,26 +57,26 @@ public abstract class Constants {
   public static final int MENU_CHART_SETTINGS = 3;
 
   /*
-   * Context menu ids. Sorted alphabetically.
+   * Context menu ids:
    */
-  public static final int MENU_CLEAR_MAP = 100;
+
+  public static final int MENU_EDIT = 100;
   public static final int MENU_DELETE = 101;
-  public static final int MENU_EDIT = 102;
-  public static final int MENU_PLAY = 103;
-  public static final int MENU_SAVE_CSV_FILE = 104;
-  public static final int MENU_SAVE_GPX_FILE = 105;
-  public static final int MENU_SAVE_KML_FILE = 106;
-  public static final int MENU_SAVE_TCX_FILE = 107;
-  public static final int MENU_SEND_TO_GOOGLE = 108;
-  public static final int MENU_SHARE = 109;
-  public static final int MENU_SHARE_CSV_FILE = 110;
-  public static final int MENU_SHARE_FUSION_TABLE = 111;
-  public static final int MENU_SHARE_GPX_FILE = 112;
-  public static final int MENU_SHARE_KML_FILE = 113;
-  public static final int MENU_SHARE_MAP = 114;
-  public static final int MENU_SHARE_TCX_FILE = 115;
-  public static final int MENU_SHOW = 116;
-  public static final int MENU_WRITE_TO_SD_CARD = 117;
+  public static final int MENU_SEND_TO_GOOGLE = 102;
+  public static final int MENU_SHARE = 103;
+  public static final int MENU_SHOW = 104;
+  public static final int MENU_SHARE_MAP = 200;
+  public static final int MENU_SHARE_FUSION_TABLE = 201;
+  public static final int MENU_SHARE_GPX_FILE = 202;
+  public static final int MENU_SHARE_KML_FILE = 203;
+  public static final int MENU_SHARE_CSV_FILE = 204;
+  public static final int MENU_SHARE_TCX_FILE = 205;
+  public static final int MENU_WRITE_TO_SD_CARD = 206;
+  public static final int MENU_SAVE_GPX_FILE = 207;
+  public static final int MENU_SAVE_KML_FILE = 208;
+  public static final int MENU_SAVE_CSV_FILE = 209;
+  public static final int MENU_SAVE_TCX_FILE = 210;
+  public static final int MENU_CLEAR_MAP = 211;
 
   /**
    * The number of distance readings to smooth to get a stable signal.

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

@@ -30,13 +30,11 @@ import com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActi
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.GeoRect;
 import com.google.android.apps.mytracks.util.LocationUtils;
-import com.google.android.apps.mytracks.util.PlayTrackUtils;
 import com.google.android.maps.GeoPoint;
 import com.google.android.maps.MapController;
 import com.google.android.maps.MapView;
 import com.google.android.maps.mytracks.R;
 
-import android.app.Dialog;
 import android.content.ContentUris;
 import android.content.Intent;
 import android.location.Location;
@@ -72,8 +70,6 @@ public class MapActivity extends com.google.android.maps.MapActivity
     implements View.OnTouchListener, View.OnClickListener,
         TrackDataListener {
 
-  private static final int DIALOG_INSTALL_EARTH = 0;
-
   // Saved instance state keys:
   // ---------------------------
 
@@ -235,16 +231,6 @@ public class MapActivity extends com.google.android.maps.MapActivity
     super.onPause();
   }
 
-  @Override
-  protected Dialog onCreateDialog(int id) {
-    switch (id) {
-      case DIALOG_INSTALL_EARTH:
-        return PlayTrackUtils.createInstallEarthDialog(this);
-      default:
-        return null;
-    }
-  }
-
   // Utility functions:
   // -------------------
 
@@ -441,7 +427,6 @@ public class MapActivity extends com.google.android.maps.MapActivity
             String shareFileFormat = getString(R.string.track_list_share_file);
             String fileTypes[] = getResources().getStringArray(R.array.file_types);
 
-            menu.add(Menu.NONE, Constants.MENU_PLAY, Menu.NONE, R.string.track_list_play);
             menu.add(Menu.NONE, Constants.MENU_SEND_TO_GOOGLE, Menu.NONE,
                 R.string.track_list_send_google);
             SubMenu share = menu.addSubMenu(
@@ -479,18 +464,6 @@ public class MapActivity extends com.google.android.maps.MapActivity
     Intent intent;
     long trackId = dataHub.getSelectedTrackId();
     switch (item.getItemId()) {
-      case Constants.MENU_EDIT: 
-        intent = new Intent(this, TrackDetail.class).putExtra(TrackDetail.TRACK_ID, trackId);
-        startActivity(intent);
-        return true;
-      case Constants.MENU_PLAY:
-        if (PlayTrackUtils.isEarthInstalled(this)) {
-          PlayTrackUtils.playTrack(this, trackId);
-          return true;
-        } else {
-          showDialog(DIALOG_INSTALL_EARTH);
-          return true;
-        }
       case Constants.MENU_SEND_TO_GOOGLE:
         intent = new Intent(this, UploadServiceChooserActivity.class)
             .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, true, true, true));
@@ -506,25 +479,32 @@ public class MapActivity extends com.google.android.maps.MapActivity
             .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, false, true, false));
         startActivity(intent);
         return true;
-      case Constants.MENU_SHARE_GPX_FILE:
-      case Constants.MENU_SHARE_KML_FILE:
-      case Constants.MENU_SHARE_CSV_FILE:
-      case Constants.MENU_SHARE_TCX_FILE:
       case Constants.MENU_SAVE_GPX_FILE:
       case Constants.MENU_SAVE_KML_FILE:
       case Constants.MENU_SAVE_CSV_FILE:
       case Constants.MENU_SAVE_TCX_FILE:
+      case Constants.MENU_SHARE_GPX_FILE:
+      case Constants.MENU_SHARE_KML_FILE:
+      case Constants.MENU_SHARE_CSV_FILE:
+      case Constants.MENU_SHARE_TCX_FILE:
         SaveActivity.handleExportTrackAction(
             this, trackId, Constants.getActionFromMenuId(item.getItemId()));
         return true;
-      case Constants.MENU_CLEAR_MAP:
-        dataHub.unloadCurrentTrack();
+      case Constants.MENU_EDIT: {
+        intent = new Intent(this, TrackDetail.class);
+        intent.putExtra(TrackDetail.TRACK_ID, trackId);
+        startActivity(intent);
         return true;
-      case Constants.MENU_DELETE:
+      }
+      case Constants.MENU_DELETE: {
         Uri uri = ContentUris.withAppendedId(TracksColumns.CONTENT_URI, trackId);
         intent = new Intent(Intent.ACTION_DELETE, uri);
         startActivity(intent);
         return true;
+      }
+      case Constants.MENU_CLEAR_MAP:
+        dataHub.unloadCurrentTrack();
+        return true;
       default:
         return super.onMenuItemSelected(featureId, item);
     }

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

@@ -22,7 +22,6 @@ import com.google.android.apps.mytracks.maps.TrackPathPainter;
 import com.google.android.apps.mytracks.maps.TrackPathPainterFactory;
 import com.google.android.apps.mytracks.maps.TrackPathUtilities;
 import com.google.android.apps.mytracks.util.LocationUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.GeoPoint;
 import com.google.android.maps.MapView;
 import com.google.android.maps.Overlay;
@@ -104,7 +103,7 @@ public class MapOverlay extends Overlay implements OnSharedPreferenceChangeListe
     public CachedLocation(Location location) {
       this.valid = LocationUtils.isValidLocation(location);
       this.geoPoint = valid ? LocationUtils.getGeoPoint(location) : null;
-      this.speed = (int) Math.floor(location.getSpeed() * UnitConversions.MS_TO_KMH);
+      this.speed = (int) Math.floor(location.getSpeed() * 3.6);
     }
   };
 

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

@@ -17,16 +17,17 @@ 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;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 import com.google.android.apps.mytracks.content.WaypointsColumns;
+import com.google.android.apps.mytracks.io.file.TempFileCleaner;
 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,6 +93,11 @@ public class MyTracks extends TabActivity implements OnTouchListener {
    */
   private MyTracksProviderUtils providerUtils;
 
+  /**
+   * Google Analytics tracker
+   */
+  private GoogleAnalyticsTracker tracker;
+
   /*
    * Tabs/View navigation:
    */
@@ -139,7 +145,12 @@ public class MyTracks extends TabActivity implements OnTouchListener {
       ApiAdapterFactory.getApiAdapter().enableStrictMode();
     }
 
-    AnalyticsUtils.sendPageViews(this, "/appstart");
+    tracker = GoogleAnalyticsTracker.getInstance();
+    // 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);
@@ -245,7 +256,14 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   @Override
   protected void onStop() {
     Log.d(TAG, "MyTracks.onStop");
+
     dataHub.stop();
+
+    tracker.dispatch();
+    tracker.stop();
+
+    // Clean up any temporary track files.
+    TempFileCleaner.clean();
     super.onStop();
   }
 

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

@@ -16,10 +16,8 @@
 package com.google.android.apps.mytracks;
 
 import com.google.android.apps.mytracks.content.TrackDataHub;
-import com.google.android.apps.mytracks.services.RemoveTempFilesService;
 
 import android.app.Application;
-import android.content.Intent;
 
 /**
  * MyTracksApplication for keeping global state.
@@ -30,11 +28,6 @@ public class MyTracksApplication extends Application {
 
   private TrackDataHub trackDataHub;
 
-  @Override
-  public void onCreate() {
-    startService(new Intent(this, RemoveTempFilesService.class));
-  }
-
   /**
    * Gets the application's TrackDataHub.
    * 

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

@@ -207,8 +207,9 @@ 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, StringUtils.formatTimeDistance(
-        this, stats.getTotalTime(), stats.getTotalDistance(), metricUnits));
+    resultMap.put(STATS_FIELD,
+        StringUtils.formatTimeDistance(this, stats.getTotalDistance(), stats.getTotalTime(),
+            metricUnits));
     resultMap.put(TRACK_ID_FIELD, track.getId());
   }
 

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

@@ -502,7 +502,7 @@ public class SettingsActivity extends PreferenceActivity {
           format = getString(stringId);
           options[i] = String.format(format, value);
         } else {
-          double mile = value * UnitConversions.FT_TO_MI;
+          double mile = value / UnitConversions.MI_TO_FEET;
           format = getString(R.string.value_float_mile);
           options[i] = String.format(format, mile);
         }
@@ -545,7 +545,7 @@ public class SettingsActivity extends PreferenceActivity {
           }
           options[i] = String.format(format, value);
         } else {
-          double mile = value * UnitConversions.FT_TO_MI;
+          double mile = value / UnitConversions.MI_TO_FEET;
           if (values[i].equals(GPS_ACCURACY_POOR)) {
             format = getString(R.string.value_float_mile_poor_gps);
           } else {
@@ -644,7 +644,7 @@ public class SettingsActivity extends PreferenceActivity {
     String metricspeed = prefs.getString(getString(id), null);
     int englishspeed;
     try {
-      englishspeed = (int) (Double.parseDouble(metricspeed) * UnitConversions.KM_TO_MI);
+      englishspeed = (int) (Double.parseDouble(metricspeed) * UnitConversions.KMH_TO_MPH);
     } catch (NumberFormatException e) {
       englishspeed = 0;
     }
@@ -663,7 +663,7 @@ public class SettingsActivity extends PreferenceActivity {
       // Convert miles/h to km/h
       try {
         metricspeed = String.valueOf(
-            (int) (Double.parseDouble(newValue) * UnitConversions.MI_TO_KM));
+            (int) (Double.parseDouble(newValue) * UnitConversions.MPH_TO_KMH) + 1);
       } catch (NumberFormatException e) {
         metricspeed = "0";
       }

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

@@ -23,7 +23,6 @@ import com.google.android.apps.mytracks.content.TrackDataHub.ListenerDataType;
 import com.google.android.apps.mytracks.content.TrackDataListener;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.services.ServiceUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -191,7 +190,7 @@ public class StatsActivity extends Activity implements TrackDataListener {
     utils.setAltitude(R.id.elevation_register, l.getAltitude());
     utils.setLatLong(R.id.latitude_register, l.getLatitude());
     utils.setLatLong(R.id.longitude_register, l.getLongitude());
-    utils.setSpeed(R.id.speed_register, l.getSpeed() * UnitConversions.MS_TO_KMH);
+    utils.setSpeed(R.id.speed_register, l.getSpeed() * 3.6);
   }
 
   private void showUnknownLocation() {

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

@@ -213,10 +213,10 @@ public class StatsUtilities {
       double minElevation, double maxElevation, double elevationGain,
       double minGrade, double maxGrade) {
     setTime(R.id.moving_time_register, movingTime);
-    setDistance(R.id.total_distance_register, totalDistance * UnitConversions.M_TO_KM);
-    setSpeed(R.id.average_speed_register, averageSpeed * UnitConversions.MS_TO_KMH);
-    setSpeed(R.id.average_moving_speed_register, averageMovingSpeed * UnitConversions.MS_TO_KMH);
-    setSpeed(R.id.max_speed_register, maxSpeed * UnitConversions.MS_TO_KMH);
+    setDistance(R.id.total_distance_register, totalDistance / 1000.0);
+    setSpeed(R.id.average_speed_register, averageSpeed * 3.6);
+    setSpeed(R.id.average_moving_speed_register, averageMovingSpeed * 3.6);
+    setSpeed(R.id.max_speed_register, maxSpeed * 3.6);
     setAltitude(R.id.min_elevation_register, minElevation);
     setAltitude(R.id.max_elevation_register, maxElevation);
     setAltitude(R.id.elevation_gain_register, elevationGain);
@@ -226,11 +226,11 @@ public class StatsUtilities {
 
   public void setAllStats(TripStatistics stats) {
     setTime(R.id.moving_time_register, stats.getMovingTime());
-    setDistance(R.id.total_distance_register, stats.getTotalDistance() * UnitConversions.M_TO_KM);
-    setSpeed(R.id.average_speed_register, stats.getAverageSpeed() * UnitConversions.MS_TO_KMH);
+    setDistance(R.id.total_distance_register, stats.getTotalDistance() / 1000.0);
+    setSpeed(R.id.average_speed_register, stats.getAverageSpeed() * 3.6);
     setSpeed(R.id.average_moving_speed_register,
-        stats.getAverageMovingSpeed() * UnitConversions.MS_TO_KMH);
-    setSpeed(R.id.max_speed_register, stats.getMaxSpeed() * UnitConversions.MS_TO_KMH);
+        stats.getAverageMovingSpeed() * 3.6);
+    setSpeed(R.id.max_speed_register, stats.getMaxSpeed() * 3.6);
     setAltitude(R.id.min_elevation_register, stats.getMinElevation());
     setAltitude(R.id.max_elevation_register, stats.getMaxElevation());
     setAltitude(R.id.elevation_gain_register, stats.getTotalElevationGain());

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

@@ -23,11 +23,9 @@ import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity;
 import com.google.android.apps.mytracks.services.ServiceUtils;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
-import com.google.android.apps.mytracks.util.PlayTrackUtils;
 import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.maps.mytracks.R;
 
-import android.app.Dialog;
 import android.app.ListActivity;
 import android.content.ContentUris;
 import android.content.Context;
@@ -62,8 +60,6 @@ public class TrackList extends ListActivity
     implements SharedPreferences.OnSharedPreferenceChangeListener,
         View.OnClickListener {
 
-  private static final int DIALOG_INSTALL_EARTH = 0;
-  
   private int contextPosition = -1;
   private long trackId = -1;
   private ListView listView = null;
@@ -91,7 +87,6 @@ public class TrackList extends ListActivity
             String shareFileFormat = getString(R.string.track_list_share_file);
             String fileTypes[] = getResources().getStringArray(R.array.file_types);
 
-            menu.add(Menu.NONE, Constants.MENU_PLAY, Menu.NONE, R.string.track_list_play);
             menu.add(Menu.NONE, Constants.MENU_SEND_TO_GOOGLE, Menu.NONE,
                 R.string.track_list_send_google);
             SubMenu share = menu.addSubMenu(
@@ -169,18 +164,14 @@ public class TrackList extends ListActivity
         return true;
       }
       case Constants.MENU_EDIT: {
-        intent = new Intent(this, TrackDetail.class).putExtra(TrackDetail.TRACK_ID, trackId);
+        intent = new Intent(this, TrackDetail.class);
+        intent.putExtra(TrackDetail.TRACK_ID, trackId);
         startActivity(intent);
         return true;
       }
-      case Constants.MENU_PLAY:
-        if (PlayTrackUtils.isEarthInstalled(this)) {
-          PlayTrackUtils.playTrack(this, trackId);
-          return true;
-        } else {
-          showDialog(DIALOG_INSTALL_EARTH);
-          return true;
-        }
+      case Constants.MENU_SHARE:
+      case Constants.MENU_WRITE_TO_SD_CARD:
+        return false;
       case Constants.MENU_SEND_TO_GOOGLE:
         intent = new Intent(this, UploadServiceChooserActivity.class)
             .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, true, true, true));
@@ -196,23 +187,24 @@ public class TrackList extends ListActivity
             .putExtra(SendRequest.SEND_REQUEST_KEY, new SendRequest(trackId, false, true, false));
         startActivity(intent);
         return true;
-      case Constants.MENU_SHARE_GPX_FILE:
-      case Constants.MENU_SHARE_KML_FILE:
-      case Constants.MENU_SHARE_CSV_FILE:
-      case Constants.MENU_SHARE_TCX_FILE:
       case Constants.MENU_SAVE_GPX_FILE:
       case Constants.MENU_SAVE_KML_FILE:
       case Constants.MENU_SAVE_CSV_FILE:
       case Constants.MENU_SAVE_TCX_FILE:
-        SaveActivity.handleExportTrackAction(
-            this, trackId, Constants.getActionFromMenuId(item.getItemId()));
+      case Constants.MENU_SHARE_GPX_FILE:
+      case Constants.MENU_SHARE_KML_FILE:
+      case Constants.MENU_SHARE_CSV_FILE:
+      case Constants.MENU_SHARE_TCX_FILE:
+        SaveActivity.handleExportTrackAction(this, trackId,
+            Constants.getActionFromMenuId(item.getItemId()));
         return true;
-      case Constants.MENU_DELETE:
+      case Constants.MENU_DELETE: {
+        intent = new Intent(Intent.ACTION_DELETE);
         Uri uri = ContentUris.withAppendedId(TracksColumns.CONTENT_URI, trackId);
-        intent = new Intent(Intent.ACTION_DELETE)
-            .setDataAndType(uri, TracksColumns.CONTENT_ITEMTYPE);
+        intent.setDataAndType(uri, TracksColumns.CONTENT_ITEMTYPE);
         startActivity(intent);
         return true;
+      }
       default:
         Log.w(TAG, "Unknown menu item: " + item.getItemId() + "(" + item.getTitle() + ")");
         return super.onMenuItemSelected(featureId, item);
@@ -295,16 +287,6 @@ public class TrackList extends ListActivity
     return true;
   }
 
-  @Override
-  protected Dialog onCreateDialog(int id) {
-    switch (id) {
-      case DIALOG_INSTALL_EARTH:
-        return PlayTrackUtils.createInstallEarthDialog(this);
-      default:
-        return null;
-    }
-  }
-
   /* Callback from menu/search_only.xml */
   public void onSearch(@SuppressWarnings("unused") MenuItem i) {
     onSearchRequested();
@@ -349,8 +331,7 @@ 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, totalTime, totalDistance, metricUnits);
+          String totalDistanceStr = StringUtils.formatTimeDistance(TrackList.this, totalDistance, totalTime, metricUnits);
           textView.setText(totalDistanceStr);
         } else {
           textView.setText(cursor.getString(columnIndex));

MyTracks/src/com/google/android/apps/mytracks/WaypointsList.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.mytracks.content.DescriptionGeneratorImpl;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
@@ -320,7 +319,7 @@ public class WaypointsList extends ListActivity
           public void onClick(DialogInterface dialogInterface, int i) {
             dialogInterface.dismiss();
             providerUtils.deleteWaypoint(waypointId,
-                new DescriptionGeneratorImpl(WaypointsList.this));
+                new StringUtils(WaypointsList.this));
           }
         });
     builder.setNegativeButton(getString(R.string.generic_no),

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

@@ -1,257 +0,0 @@
-/*
- * 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.content;
-
-import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.ChartURLGenerator;
-import com.google.android.apps.mytracks.util.StringUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
-import com.google.android.maps.mytracks.R;
-import com.google.common.annotations.VisibleForTesting;
-
-import android.content.Context;
-import android.util.Pair;
-
-import java.util.Vector;
-
-/**
- * An implementation of {@link DescriptionGenerator} for My Tracks.
- *
- * @author Jimmy Shih
- */
-public class DescriptionGeneratorImpl implements DescriptionGenerator {
-
-  private static final String HTML_LINE_BREAK = "<br>";
-  private static final String TEXT_LINE_BREAK = "\n";
-
-  private Context context;
-
-  public DescriptionGeneratorImpl(Context context) {
-    this.context = context;
-  }
-
-  @Override
-  public String generateTrackDescription(
-      Track track, Vector<Double> distances, Vector<Double> elevations) {
-    StringBuilder builder = new StringBuilder();
-
-    // Created by
-    String url = context.getString(R.string.my_tracks_web_url);
-    builder.append(context.getString(
-        R.string.send_google_by_my_tracks, "<a href='http://" + url + "'>", "</a>"));
-    builder.append("<p>");
-
-    builder.append(generateTripStatisticsDescription(track.getStatistics(), true));
-
-    // Activity type
-    String trackCategory = track.getCategory();
-    String category = trackCategory != null && trackCategory.length() > 0 ? trackCategory
-        : context.getString(R.string.value_unknown);
-    builder.append(context.getString(R.string.description_activity_type, category));
-    builder.append(HTML_LINE_BREAK);
-
-    // Elevation chart
-    if (distances != null && elevations != null) {
-      builder.append("<img border=\"0\" src=\""
-          + ChartURLGenerator.getChartUrl(distances, elevations, track, context) + "\"/>");
-      builder.append(HTML_LINE_BREAK);
-    }
-    return builder.toString();
-  }
-
-  @Override
-  public String generateWaypointDescription(Waypoint waypoint) {
-    return generateTripStatisticsDescription(waypoint.getStatistics(), false);
-  }
-
-  /**
-   * Generates a description for a {@link TripStatistics}.
-   *
-   * @param stats the trip statistics
-   * @param html true to use "<br>" for line break instead of "\n"
-   */
-  private String generateTripStatisticsDescription(TripStatistics stats, boolean html) {
-    String lineBreak = html ? HTML_LINE_BREAK : TEXT_LINE_BREAK;
-    StringBuilder builder = new StringBuilder();
-
-    // Total distance
-    writeDistance(
-        stats.getTotalDistance(), builder, R.string.description_total_distance, lineBreak);
-
-    // Total time
-    writeTime(stats.getTotalTime(), builder, R.string.description_total_time, lineBreak);
-
-    // Moving time
-    writeTime(stats.getMovingTime(), builder, R.string.description_moving_time, lineBreak);
-
-    // Average speed
-    Pair<Double, Double> averageSpeed = writeSpeed(
-        stats.getAverageSpeed(), builder, R.string.description_average_speed, lineBreak);
-
-    // Average moving speed
-    Pair<Double, Double> averageMovingSpeed = writeSpeed(stats.getAverageMovingSpeed(), builder,
-        R.string.description_average_moving_speed, lineBreak);
-
-    // Max speed
-    Pair<Double, Double> maxSpeed = writeSpeed(
-        stats.getMaxSpeed(), builder, R.string.description_max_speed, lineBreak);
-
-    // Average pace
-    writePace(averageSpeed, builder, R.string.description_average_pace, lineBreak);
-
-    // Average moving pace
-    writePace(averageMovingSpeed, builder, R.string.description_average_moving_pace, lineBreak);
-
-    // Min pace
-    writePace(maxSpeed, builder, R.string.description_min_pace, lineBreak);
-
-    // Max elevation
-    writeElevation(stats.getMaxElevation(), builder, R.string.description_max_elevation, lineBreak);
-
-    // Min elevation
-    writeElevation(stats.getMinElevation(), builder, R.string.description_min_elevation, lineBreak);
-
-    // Elevation gain
-    writeElevation(
-        stats.getTotalElevationGain(), builder, R.string.description_elevation_gain, lineBreak);
-
-    // Max grade
-    writeGrade(stats.getMaxGrade(), builder, R.string.description_max_grade, lineBreak);
-
-    // Min grade
-    writeGrade(stats.getMinGrade(), builder, R.string.description_min_grade, lineBreak);
-
-    // Recorded time
-    builder.append(
-        context.getString(R.string.description_recorded_time,
-            StringUtils.formatDateTime(context, stats.getStartTime())));
-    builder.append(lineBreak);
-
-    return builder.toString();
-  }
-
-  /**
-   * Writes distance.
-   *
-   * @param distance distance in meters
-   * @param builder StringBuilder to append distance
-   * @param resId resource id of distance string
-   * @param lineBreak line break string
-   */
-  @VisibleForTesting
-  void writeDistance(double distance, StringBuilder builder, int resId, String lineBreak) {
-    double distanceInKm = distance * UnitConversions.M_TO_KM;
-    double distanceInMi = distanceInKm * UnitConversions.KM_TO_MI;
-    builder.append(context.getString(resId, distanceInKm, distanceInMi));
-    builder.append(lineBreak);
-  }
-
-  /**
-   * Writes time.
-   *
-   * @param time time in milliseconds.
-   * @param builder StringBuilder to append time
-   * @param resId resource id of time string
-   * @param lineBreak line break string
-   */
-  @VisibleForTesting
-  void writeTime(long time, StringBuilder builder, int resId, String lineBreak) {
-    builder.append(context.getString(resId, StringUtils.formatElapsedTime(time)));
-    builder.append(lineBreak);
-  }
-
-  /**
-   * Writes speed.
-   *
-   * @param speed speed in meters per second
-   * @param builder StringBuilder to append speed
-   * @param resId resource id of speed string
-   * @param lineBreak line break string
-   * @return a pair of speed, first in kilometers per hour, second in miles per
-   *         hour.
-   */
-  @VisibleForTesting
-  Pair<Double, Double> writeSpeed(
-      double speed, StringBuilder builder, int resId, String lineBreak) {
-    double speedInKmHr = speed * UnitConversions.MS_TO_KMH;
-    double speedInMiHr = speedInKmHr * UnitConversions.KM_TO_MI;
-    builder.append(context.getString(resId, speedInKmHr, speedInMiHr));
-    builder.append(lineBreak);
-    return Pair.create(speedInKmHr, speedInMiHr);
-  }
-
-  /**
-   * Writes pace.
-   *
-   * @param speed a pair of speed, first in kilometers per hour, second in miles
-   *          per hour
-   * @param builder StringBuilder to append pace
-   * @param resId resource id of pace string
-   * @param lineBreak line break string
-   */
-  @VisibleForTesting
-  void writePace(
-      Pair<Double, Double> speed, StringBuilder builder, int resId, String lineBreak) {
-    double paceInMinKm = getPace(speed.first);
-    double paceInMinMi = getPace(speed.second);
-    builder.append(context.getString(resId, paceInMinKm, paceInMinMi));
-    builder.append(lineBreak);
-  }
-
-  /**
-   * Writes elevation.
-   *
-   * @param elevation elevation in meters
-   * @param builder StringBuilder to append elevation
-   * @param resId resource id of elevation string
-   * @param lineBreak line break string
-   */
-  @VisibleForTesting
-  void writeElevation(
-      double elevation, StringBuilder builder, int resId, String lineBreak) {
-    long elevationInM = Math.round(elevation);
-    long elevationInFt = Math.round(elevation * UnitConversions.M_TO_FT);
-    builder.append(context.getString(resId, elevationInM, elevationInFt));
-    builder.append(lineBreak);
-  }
-
-  /**
-   * Writes grade.
-   *
-   * @param grade grade in fraction
-   * @param builder StringBuilder to append grade
-   * @param resId resource id grade string
-   * @param lineBreak line break string
-   */
-  @VisibleForTesting
-  void writeGrade(double grade, StringBuilder builder, int resId, String lineBreak) {
-    long gradeInPercent = Double.isNaN(grade) || Double.isInfinite(grade) ? 0L
-        : Math.round(grade * 100);
-    builder.append(context.getString(resId, gradeInPercent));
-    builder.append(lineBreak);
-  }
-
-  /**
-   * Gets pace (in minutes) from speed.
-   *
-   * @param speed speed in hours
-   */
-  @VisibleForTesting
-  double getPace(double speed) {
-    return speed == 0 ? 0.0 : 60.0 / speed; // convert from hours to minutes
-  }
-}

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

@@ -17,7 +17,6 @@ package com.google.android.apps.mytracks.content;
 
 import com.google.android.apps.mytracks.stats.TripStatistics;
 import com.google.android.apps.mytracks.util.LocationUtils;
-import com.google.android.apps.mytracks.util.UnitConversions;
 
 import android.database.Cursor;
 import android.location.Location;
@@ -386,7 +385,7 @@ public class SearchEngine {
         distanceResults);
 
     // Score tracks close to the current location higher.
-    double distanceKm = distanceResults[0] * UnitConversions.M_TO_KM;
+    double distanceKm = distanceResults[0] / 1000.0;
     if (distanceKm > 0.0) {
       // Use the inverse of the amortized distance.
       return squash(distanceKm);

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.formatElapsedTimeWithHour(stats.getTotalTime()));
-    appendTag(builder, "movingtime", StringUtils.formatElapsedTimeWithHour(stats.getMovingTime()));
+    appendTag(builder, "totaltime", StringUtils.formatElapsedTime(stats.getTotalTime()));
+    appendTag(builder, "movingtime", StringUtils.formatElapsedTime(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.formatCData(value))
+        .append(StringUtils.stringAsCData(value))
         .append("</gsx:")
         .append(name)
         .append(">");
@@ -349,7 +349,7 @@ public class SendDocsUtils {
    */
   @VisibleForTesting
   static final String getDistance(double distanceInMeter, boolean metricUnits) {
-    double distanceInKilometer = distanceInMeter * UnitConversions.M_TO_KM;
+    double distanceInKilometer = distanceInMeter / 1000.0;
     double distance = metricUnits ? distanceInKilometer
         : distanceInKilometer * UnitConversions.KM_TO_MI;
     return NUMBER_FORMAT.format(distance);
@@ -363,9 +363,9 @@ public class SendDocsUtils {
    */
   @VisibleForTesting
   static final String getSpeed(double speedInMeterPerSecond, boolean metricUnits) {
-    double speedInKilometerPerHour = speedInMeterPerSecond * UnitConversions.MS_TO_KMH;
+    double speedInKilometerPerHour = speedInMeterPerSecond * 3.6;
     double speed = metricUnits ? speedInKilometerPerHour
-        : speedInKilometerPerHour * UnitConversions.KM_TO_MI;
+        : speedInKilometerPerHour * UnitConversions.KMH_TO_MPH;
     return NUMBER_FORMAT.format(speed);
   }