Releasing 1.1.5

.hgignore

@@ -5,4 +5,5 @@ syntax:glob
 */proguard/**
 .metadata
 MyTracksTest/annotations.log
-MyTracks/src/com/google/android/apps/mytracks/io/mymaps
+**/*.pyc
+**/*.pyo

MyTracks/.classpath

@@ -8,7 +8,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry kind="lib" path="libs/libmymaps.jar"/>
 	<classpathentry kind="src" path="MyTracksLib_src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

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="26"
-          android:versionName="1.1.3">
+          android:versionCode="28"
+          android:versionName="1.1.5">
   <application android:icon="@drawable/arrow_icon"
                android:label="@string/app_name"
                android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
@@ -52,7 +52,7 @@ limitations under the License.
       </intent-filter>
     </activity>
 
-    <activity android:name="com.google.android.apps.mytracks.MyTracksMap"
+    <activity android:name="com.google.android.apps.mytracks.MapActivity"
               android:label="MyTracks"
               android:exported="false" />
 
@@ -61,19 +61,19 @@ limitations under the License.
               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
               android:exported="false" />
 
-    <activity android:name="com.google.android.apps.mytracks.MyTracksList"
+    <activity android:name="com.google.android.apps.mytracks.TrackList"
               android:label="Recorded Tracks" />
 
-    <activity android:name="com.google.android.apps.mytracks.MyTracksWaypointsList"
+    <activity android:name="com.google.android.apps.mytracks.WaypointsList"
               android:label="Recorded Waypoints" />
 
-    <activity android:name="com.google.android.apps.mytracks.MyTracksDetails"
+    <activity android:name="com.google.android.apps.mytracks.TrackDetails"
               android:label="@string/trackdetails_title" />
 
-    <activity android:name="com.google.android.apps.mytracks.MyTracksWaypointDetails"
+    <activity android:name="com.google.android.apps.mytracks.WaypointDetails"
               android:label="@string/waypointdetails_title" />
 
-    <activity android:name="com.google.android.apps.mytracks.MyTracksSettings"
+    <activity android:name="com.google.android.apps.mytracks.SettingsActivity"
               android:label="@string/mytracks_settings" />
 
     <activity android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
@@ -101,7 +101,7 @@ limitations under the License.
              android:exported="true"
              android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
 
-    <receiver android:name="com.google.android.apps.mytracks.MyTracksReceiver">
+    <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
       <intent-filter>
         <action android:name="android.intent.action.BOOT_COMPLETED" />
 	  </intent-filter>

MyTracks/res/values-ca/arrays.xml

@@ -112,9 +112,9 @@ limitations under the License.
     <item>3.1 miles (senyal GPS pobre)</item>
   </string-array>
 
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>Sense divisió</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Inactiu</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -130,8 +130,8 @@ limitations under the License.
     <item>1 min</item>
   </string-array>
 
-  <string-array name="split_frequency_options_ft">
-    <item>No splitting</item>
+  <string-array name="task_frequency_options_ft">
+    <item>Inactiu</item>
     <item>100 mi</item>
     <item>50 mi</item>
     <item>25 mi</item>
@@ -286,6 +286,8 @@ limitations under the License.
 
   <array name="sensor_type_options">
     <item>Cap</item>
+    <item>ANT+ Sensors</item>
+    <item>SRM ANT+ Bridge</item>
     <item>Zephyr Bluetooth</item>
   </array>
 

MyTracks/res/values-ca/strings.xml

@@ -225,7 +225,6 @@ limitations under the License.
   <string name="settings_backup_to_sd_summary">Escriu una còpia completa de totes les rutes i els paràmetres a la targeta SD</string>
   <string name="settings_restore_from_sd">Restaura ara</string>
   <string name="settings_restore_from_sd_summary">Restaura totes les rutes i els paràmetres des de la targeta SD.</string>
-  <string name="settings_no_backup_while_recording">No es poden gestionar les còpies de seguretat mentre s\'enregistra una ruta.</string>
 
   <!-- Backups -->
   <string name="restore_overwrites_warning">La restauració d\'una còpia de seguretat des de la targeta SD sobreescriurà totes les rutes i paràmetres. Esteu segur?</string>

MyTracks/res/values-de/arrays.xml

@@ -48,7 +48,6 @@ limitations under the License.
     <item>328 Fuß</item>
   </string-array>
 
-
   <!-- Maximum recording distance -->
   <string-array name="max_recording_distance_options">
     <item>50 m</item>
@@ -113,9 +112,9 @@ limitations under the License.
     <item>3,1 Meilen (sehr schlechtes GPS-Signal)</item>
   </string-array>
 
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>Nicht zerteilen</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Aus</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -132,7 +131,7 @@ limitations under the License.
   </string-array>
 
   <string-array name="split_frequency_options_ft">
-    <item>Nicht zerteilen</item>
+    <item>Aus</item>
     <item>100 Meilen</item>
     <item>50 Meilen</item>
     <item>25 Meilen</item>

MyTracks/res/values-de/strings.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 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.
@@ -31,7 +31,7 @@ limitations under the License.
   <string name="current_segment">Letztes Segment</string>
   <string name="sensor_state">Sensorstatus</string>
   <string name="aggregated_stats">Aggregierte Statistiken</string>
- 
+
   <!-- Error messages -->
   <string name="error_no_location_manager">Es wurde kein Dienst zur Positionsermittlung auf diesem Gerät gefunden.</string>
   <string name="error_no_gps_location_provider">Es wurde kein GPS-Empfänger auf diesem Gerät gefunden.</string>
@@ -45,7 +45,7 @@ limitations under the License.
   <string name="error_track_does_not_exist">Track existiert nicht.</string>
   <string name="error_out_of_memory">Die Datei ist zu groß (maximal 500 KB). Operation abgebrochen.</string>
   <string name="error_unable_to_insert_marker">Der Wegpunkt kann nicht einfügt werden. Keine Positionsbestimmung möglich.</string>
- 
+
   <!-- Status messages -->
   <string name="wait_for_fix">Warte auf ein besseres GPS-Signal. Bitte stelle sicher, dass der Himmel sichtbar ist.</string>
   <string name="status_now_recording">Ein neuer Track wird aufgezeichnet.</string>
@@ -59,7 +59,7 @@ limitations under the License.
   <string name="status_no_location">Die Position kann derzeit nicht bestimmt werden. Aktiviere mehr Positionsquellen (siehe Sicherheits- und Positionseinstellungen) und stelle sicher, dass der Himmel sichtbar ist.</string>
   <string name="status_waypoint_inserted">Ein Wegpunkt wurde eingefügt.</string>
   <string name="status_statistics_inserted">Ein Statistikwegpunkt wurde eingefügt.</string>
- 
+
   <!-- Progress dialog -->
   <string name="progress_title">Bitte warten…</string>
   <string name="progress_message">Dein Track wird an Google gesendet...</string>
@@ -73,28 +73,28 @@ limitations under the License.
   <string name="import_progress_message">Importiere GPS-Track. Das kann ein wenig dauern.</string>
   <string name="write_progress_message">Schreibe Datei auf SD-Karte. Das kann ein wenig dauern.</string>
   <string name="progress_message_updating_track">Aktualisiere Trackstatistik...</string>
- 
+
   <!-- Used by DeleteAllDataHandler -->
   <string name="are_you_sure_question">Bist Du Dir wirklich sicher?</string>
   <string name="all_data_will_be_permanently_deleted">Alle Tracks und Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
   <string name="track_will_be_permanently_deleted">Dieser Track und seine Wegpunkte werden endgültig von diesem Gerät gelöscht.</string>
   <string name="marker_will_be_permanently_deleted">Dieser Wegpunkt wird endgültig von diesem Gerät gelöscht.</string>
- 
+
   <!-- Text and links when uploading to Google Fusion Tables -->
   <string name="new_map_description">Erstellt von My Tracks für Android.</string>
   <string name="fusiontable_link">Erstellt von &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; für Android.</string>
- 
+
   <!-- Formatting of track and marker descriptions -->
   <string name="points">Punkte</string>
   <string name="recorded_date">Aufgezeichnet am</string>
   <string name="category">Aktivität</string>
   <string name="waypoint_category">Art des Wegpunktes</string>
   <string name="part">(Teil %d)</string>
- 
+
   <!-- Used by the track recording service -->
   <string name="recording_your_track">Dein Track wird aufgezeichnet…</string>
   <!--string name="new_track">Track %d</string-->
- 
+
   <!-- Common -->
   <string name="no">Nein</string>
   <string name="yes">Ja</string>
@@ -111,7 +111,7 @@ limitations under the License.
   <!-- Placemark labels for start and end of track -->
   <!--string name="start">(Start)</string-->
   <string name="end">(Ende)</string>
- 
+
   <!--  TrackList -->
   <string name="tracklist_show_track">Anzeigen</string>
   <string name="tracklist_send_to_fusiontables">An eine Google Fusion Tables-Karte senden</string>
@@ -140,7 +140,7 @@ limitations under the License.
   <string name="tracklist_share_csv_file">Eine CSV-Datei</string>
   <string name="tracklist_share_tcx_file">Eine TCX-Datei</string>
   <string name="tracklist_clear_map">Karte zurücksetzen.</string>
- 
+
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Alle Wegpunkte löschen</string>
   <string name="waypointslist_this_waypoint">Dieser Wegpunkt</string>
@@ -150,70 +150,70 @@ limitations under the License.
   <string name="waypointslist_btn_insert_waypoint">Wegpunkt einfügen</string>
   <string name="waypointslist_btn_insert_statistics">Statistik einfügen</string>
   <string name="waypointslist_pick_one">Wegpunkt auswählen. Lange berühren für mehr Optionen.</string>
- 
+
   <!-- MyTracks Details -->
   <string name="trackdetails_title">Trackdetails</string>
   <string name="trackdetails_name">Name</string>
   <string name="trackdetails_description">Beschreibung</string>
   <string name="trackdetails_category">Aktivität (z. B. Wandern, Fahrradfahren, Laufen, Klettern…)</string>
- 
+
   <!-- MyTracks Waypoint Details -->
   <string name="waypointdetails_title">Wegpunktdetails</string>
   <string name="waypointdetails_name">Wegpunktname</string>
   <string name="waypointdetails_description">Wegpunktbeschreibung</string>
   <string name="waypointdetails_category">Art des Wegpunktes (z. B. Gebäude, Schlagloch, Sehenswürdigkeit…)</string>
- 
+
   <!-- MyTracks Settings -->
   <string name="mytracks_settings">Einstellungen für My Tracks</string>
   <string name="settings_display">Anzeige</string>
   <string name="settings_recording">Aufzeichnung</string>
   <string name="settings_sharing">Mit Freunden teilen</string>
- 
+
   <string name="settings_not_available_summary">In dieser Android-Version nicht verfügbar</string>
- 
+
   <string name="settings_announcement_frequency">Dauer zwischen Ansagen</string>
   <string name="settings_announcement_frequency_summary">Kürzeste Zeit zwischen zwei Ansagen</string>
- 
+
   <string name="settings_min_recording_distance">Kleinste Entfernung zwischen Punkten</string>
   <string name="settings_min_recording_distance_summary">Kleinste Entfernung zwischen zwei Positionsaufzeichnungen</string>
- 
+
   <string name="settings_max_recording_distance">Neues Segment, wenn Punkte weiter entfernt als</string>
   <string name="settings_max_recording_distance_summary">Der Track wird in zwei geteilt, wenn zwei folgende Punkte weiter entfernt sind als hier angegeben.</string>
- 
+
   <string name="settings_min_recording_interval">Aufzeichnungsfrequenz</string>
   <string name="settings_min_recording_interval_summary">Kürzeste Zeit zwischen zwei Positionsaufzeichnungen</string>
- 
+
   <string name="settings_min_required_accuracy">Aufzeichnung pausieren, wenn Genauigkeit kleiner als</string>
   <string name="settings_min_required_accuracy_summary">Die Aufzeichnung wird kurzfristig angehalten, wenn Deine Position nicht genauer als hier angegeben ermittelt werden kann.</string>
- 
+
   <string name="settings_metric_units">Entfernungen in metrischen Einheiten anzeigen</string>
   <string name="settings_metric_units_summary_on">Alle Entfernungen werden in metrischen Einheiten angezeigt.</string>
   <string name="settings_metric_units_summary_off">Alle Entfernungen werden in imperialen Längeneinheiten angezeigt.</string>
- 
+
   <string name="settings_map_public">Karten auf maps.google.com veröffentlichen</string>
   <string name="settings_map_public_summary_on">Hochgeladene Karten auf maps.google.com sind für alle sichtbar.</string>
   <string name="settings_map_public_summary_off">Hochgeladene Karten auf maps.google.com werden nicht öffentlich sichtbar aufgelistet.</string>
- 
+
   <string name="settings_report_speed_or_pace">Geschwindigkeitsanzeige</string>
   <string name="settings_report_speed_or_pace_summary_on">Geschwindigkeit wird angezeigt.</string>
   <string name="settings_report_speed_or_pace_summary_off">Pace wird angezeigt.</string>
- 
+
   <string name="settings_share_url_only">Nur URL als Einladung zum Teilen senden</string>
   <string name="settings_share_url_only_summary_on">Beim Teilen mit Freunden wird nur die Karten-URL gesendet.</string>
   <string name="settings_share_url_only_summary_off">Beim Teilen mit Freunden wird der GPS-Track selbst gesendet.</string>
- 
+
   <string name="settings_split_frequency">Zerteilungsfrequenz</string>
   <string name="settings_split_frequency_summary">Längste Dauer oder Entfernung, nach der automatisch ein Marker eingefügt wird.</string>
- 
+
    <string name="settings_auto_resume_track_timeout">Zeitbegrenzung der Auto-Wiederaufnahme</string>
   <string name="settings_auto_resume_track_timeout_summary">Maximale Zeit in Minuten, nach der eine abgebrochene Aufzeichnung nach einem Telefonneustart wiederaufgenommen wird.</string>
- 
+
   <string name="settings_timestamp_track_name">Zeitstempel als Trackname</string>
   <string name="settings_timestamp_track_name_summary_on">Der Trackname wird aus Datum und Zeit zum Aufzeichnungsbeginn zusammengesetzt.</string>
   <string name="settings_timestamp_track_name_summary_off">Tracknamen erhalten eine fortlaufende Nummer.</string>
- 
+
   <string name="pace_label">Pace</string>
- 
+
   <string name="eclair_required">Wird nur unter Android 2.0 oder höher unterstützt</string>
   <string name="settings_sensor_type">Sensortyp</string>
   <string name="settings_sensor_type_summary">Der Typ des zu verbindenden Sensors</string>
@@ -225,7 +225,7 @@ limitations under the License.
   <string name="bluetooth_sensor_title">Bluetooth-Sensor</string>
   <string name="bluetooth_sensor_summary">Der zu verbindende Bluetoothsensor</string>
   <string name="settings_modular_stats_display_title">Art der Datenanzeige</string>
- 
+
   <!-- Backups -->
   <string name="settings_backup">Datensicherung (BETA)</string>
   <string name="settings_sd_backup">SD-Karten-Sicherung</string>
@@ -234,13 +234,13 @@ limitations under the License.
   <string name="settings_restore_from_sd">Jetzt wiederherstellen</string>
   <string name="settings_restore_from_sd_summary">Alle Tracks und Einstellungen von der SD-Karte holen.</string>
   <string name="settings_no_backup_while_recording">Während ein Track aufgezeichnet wird, kann nicht mit der Datensicherung gearbeitet werden.</string>
- 
+
   <string name="restore_overwrites_warning">Eine Wiederherstellung von der SD-Karte ÜBERSCHREIBT alle vorhandenen Tracks und Einstellungen. Willst Du das wirklich?</string>
   <string name="select_backup_to_restore">Wähle die wiederherzustellende Datensicherung aus</string>
   <string name="no_backups">Keine Datensicherungen gefunden.</string>
   <string name="backup_write_progress_message">Schreibe alle Tracks und Einstellungen auf die SD-Karte. Dies kann eine Weile dauern...</string>
   <string name="backup_import_progress_message">Lese alle Tracks und Einstellungen von der SD-Karte. Dies kann eine Weile dauern...</string>
- 
+
   <!-- MyTracksSky -->
   <string name="mytracks_sky">GPS-Satelliten</string>
 
@@ -248,12 +248,12 @@ limitations under the License.
   <string name="share_map">Karte mit Freunden teilen</string>
   <string name="share_map_subject">Ich möchte gerne eine Karte mit Dir teilen.</string>
   <string name="share_map_body_format">Vielleicht interessierst Du Dich für diese Karte:
- 
+
       %s</string>
   <string name="send_track_subject">Ich möchte einen GPS-Track mit Dir teilen</string>
   <string name="send_track_body_format">Vielleicht interessierst Du Dich für diese Track:
- 
-      %s.</string>
+
+      Der Track kann mit Google Earth oder anderer Karten-Software visualisiert werden.</string>
   <string name="share_track">Track mit Freunden teilen</string>
 
   <!-- Visibility -->
@@ -265,39 +265,39 @@ limitations under the License.
   <!-- Average Moving -->
   <string name="average_moving_speed_label">Durchschnitt in Bew.</string>
   <string name="average_moving_pace_label">Pace in Bew.</string>
- 
+
   <!-- Average -->
   <string name="average_speed_label">Durchschnittsgeschw.</string>
   <string name="average_pace_label">Durchschnitts-Pace</string>
- 
+
   <string name="elevation_chart_name">Höhenprofil</string>
   <string name="elevation_gain_label">Höhengewinn</string>
   <string name="elevation_label">Höhe</string>
   <string name="latitude_label">Breitengrad</string>
   <string name="longitude_label">Längengrad</string>
- 
+
   <!-- Min -->
   <string name="min_elevation_label">Niedrigste Höhenlage</string>
   <string name="min_grade_label">Minimale Steigung</string>
   <string name="min_pace_label">Minimaler Pace</string>
- 
+
   <!-- Max -->
   <string name="max_elevation_label">Höchste Höhenlage</string>
   <string name="max_grade_label">Maximale Steigung</string>
   <string name="max_speed_label">Max. Geschwindigkeit</string>
- 
+
   <string name="loading_track">Lade Track…</string>
- 
+
   <!-- Chart Settings -->
   <string name="chart_settings">Diagramm-Einstellungen</string>
   <!-- X Axis -->
   <string name="x_axis">X-Achse</string>
   <string name="by_distance">Nach Entfernung</string>
   <string name="by_time">Nach Zeit</string>
- 
+
   <!-- Y Axis -->
   <string name="y_axis">Y-Achse</string>
- 
+
   <!-- Units -->
   <!-- Time  -->
   <string name="hour">Stunde</string>
@@ -309,7 +309,7 @@ limitations under the License.
   <string name="second">Sekunde</string>
   <string name="seconds">Sekunden</string>
   <!--string name="milliseconds">ms</string-->
- 
+
   <!-- Distance -->
   <!--string name="meter">m</string-->
   <!--string name="kilometer">km</string-->
@@ -317,7 +317,7 @@ limitations under the License.
   <string name="feet">Fuß</string>
   <!--string name="mile">mi</string-->
   <string name="miles_long">Meilen</string>
- 
+
   <!-- Speed and Pace -->
   <!--string name="kilometer_per_hour">km/h</string-->
   <string name="kilometer_per_hour_long">Kilometer pro Stunde</string>
@@ -350,12 +350,12 @@ limitations under the License.
   <string name="max_heart_rate">Höchste Herzfrequenz</string>
   <!--string name="unknown">-</string-->
   <string name="waiting">Bitte warten…</string>
- 
+
   <!-- End User License Agreement -->
   <string name="eula_title">Lizenzvereinbarung für Endverbraucher</string>
   <string name="accept">Akzeptieren</string>
   <string name="decline">Ablehnen</string>
- 
+
   <!-- About -->
   <string name="about">Über</string>
   <string name="help">Hilfe</string>
@@ -363,7 +363,7 @@ limitations under the License.
   <!--string name="about_version">Version:</string-->
   <string name="about_support">Unterstützung:</string>
   <string name="about_privacy">Datenschutz:</string>
- 
+
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Senden an…</string>
   <!--string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string-->
@@ -371,12 +371,12 @@ limitations under the License.
   <string name="sendtogoogle_send_now">Jetzt senden</string>
   <string name="sendtogoogle_send_stats">Trackstatistik senden</string>
   <string name="sendtogoogle_send_stats_and_points">Statistik und Punkte senden</string>
- 
+
   <!-- Getting the account to upload to. -->
   <string name="no_account_found_title">Kein Konto vorhanden</string>
   <string name="no_account_found">Kein Konto gefunden, um Tracks zu versenden.</string>
   <string name="choose_account_title">Wähle ein Konto</string>
- 
+
   <!-- SD card -->
   <string name="io_no_external_storage_found">Keine externes Speichermedium verfügbar. Stelle sicher, dass eine SD-Karte vorhanden ist und nicht bereits von einem Computer darauf zugegriffen wird.</string>
   <string name="io_write_failed">Die Datei kann nicht geschrieben werden.</string>
@@ -384,7 +384,7 @@ limitations under the License.
   <string name="io_create_dir_failed">Das Verzeichnis auf der SD-Karte kann nicht erstellt werden.</string>
   <string name="io_write_finished">Der Track wurde auf die SD-Karte geschrieben.</string>
   <string name="io_read_finished">Lesen von der SD-Karte beendet.</string>
- 
+
   <!-- VersionChecker -->
   <string name="version_check_title">Suche nach neuer Version</string>
   <string name="version_check_upgrade_button">Jetzt aktualisieren</string>
@@ -392,12 +392,12 @@ limitations under the License.
   <string name="upgrade_required">Deine Version von %1$s funktioniert möglicherweise nicht mehr richtig und wird nicht mehr unterstützt. Bitte aktualisiere %1$s.</string>
   <string name="upgrade_recommended">Deine Version von %1$s funktioniert möglicherweise nicht mehr richtig. Du kannst sie jetzt aktualisieren, oder auf sie auf eigene Gefahr weiterverwenden. Einige Funktionen wie Datenaustausch mit Google-Diensten werden möglicherweise nicht mehr funktionieren, solange Du die Software nicht aktualisierst.</string>
   <string name="upgrade_available">Eine neue Version von %1$s ist jetzt verfügbar. Du kannst Deine installierte Version ohne Probleme weiterverwenden, aber um die neuesten Funktionen in Anspruch nehmen zu können, musst Du die Software aktualisieren.</string>
- 
+
   <!-- Welcome -->
   <string name="welcome">Willkommen</string>
   <string name="welcome_read_later">OK</string>
   <string name="welcome_about">Über My Tracks</string>
- 
+
   <!-- Announcement -->
   <string name="announce_no_distance">My Tracks keine Entfernung</string>
   <!-- Format:
@@ -409,11 +409,11 @@ limitations under the License.
   $6 : Speed units (mph) : Pace units (per mile)
   -->
   <string name="announce_template">My Tracks %1$s %2$.2f %3$s in %4$s mit %5$s %6$s</string>
- 
+
   <!-- Check Units -->
   <string name="check_units_title">Einheitenbenachrichtigung</string>
   <string name="check_units_message">Voreingestellt sind metrische Einheiten. Willst Du diese Einstellung ändern?</string>
- 
+
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
   <string name="bluetooth_options">Bluetooth-Einstellungen</string>
@@ -421,12 +421,12 @@ limitations under the License.
   <string name="bluetooth_pairing_summary">Öffnet Androids Bluetooth-Einstellungen, um Geräte zu verbinden.</string>
   <!--string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string-->
   <string name="sensor_options">Sensor-Einstellungen</string>
- 
+
   <!-- Bluetooth Sensor -->
   <string name="bluetooth_connected">Verbunden mit %s</string>
   <string name="bluetooth_connecting">Verbinde mit Bluetooth-Sensor ...</string>
   <string name="bluetooth_not_connected">Bluetooth-Sensor nicht verbunden.</string>
- 
+
   <!-- Sensor State -->
   <string name="sensor_data_time">Uhrzeit</string>
   <string name="power_meter_enabled">Kraftmesser aktiviert</string>
@@ -439,7 +439,7 @@ limitations under the License.
   <string name="no_sensor_service">Kein Sensor-Dienst</string>
   <string name="searching">Suche...</string>
   <string name="sending">Sende...</string>
- 
+
   <!-- Manifest description (not seen inside the app) -->
   <string name="notification_permission_label">Track-Aufzeichnungs-Benachrichtigungen empfangen</string>
   <string name="read_tracks_permission_label">Aufgezeichnete Trackdaten lesen</string>

MyTracks/res/values-es/arrays.xml

@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Apagado</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-    <item>60 min</item>
-  </string-array>
-
   <!-- Minimum recording distance -->
   <string-array name="min_recording_distance_options">
     <item>1 m</item>
@@ -112,9 +100,9 @@ limitations under the License.
     <item>3.1 miles (señal GPS débil)</item>
   </string-array>
 
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>No dividir</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Apagado</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -130,8 +118,8 @@ limitations under the License.
     <item>1 min</item>
   </string-array>
 
-  <string-array name="split_frequency_options_ft">
-    <item>No dividir</item>
+  <string-array name="task_frequency_options_ft">
+    <item>Apagado</item>
     <item>100 mi</item>
     <item>50 mi</item>
     <item>25 mi</item>

MyTracks/res/values-es/strings.xml

@@ -25,37 +25,37 @@ limitations under the License.
   <string name="delete_all_tracks">Borrar todos los recorridos</string>
   <string name="settings">Configuraciones</string>
   <string name="elevation">Elevación</string>
-  <string name="choose_track_message">Por favor seleccione el recorrido que desea ver</string>
+  <string name="choose_track_message">Por favor, seleccione el recorrido que desea ver</string>
   <string name="current_track">Recorrido actual</string>
   <string name="current_segment">Último segmento</string>
 
   <!-- Error messages -->
-  <string name="error_no_location_manager">Ningún administrador de ubicación fue hallado en este aparato! </string>
-  <string name="error_no_gps_location_provider">Ningún proveedor GPS de ubicación fue hallado en este aparato.</string>
-  <string name="error_sending_to_fusiontables">Hubo un error al mandar su recorrido a Google Fusion Tables. Por favor inténtelo de nuevo más tarde.</string>
-  <string name="error_sending_to_docs">Hubo un error al mandar su recorrido a Google Docs. Por favor inténtelo de nuevo más tarde.</string>
-  <string name="error_unable_to_start_recording">No pude empezar a grabar. Por favor inténtelo de nuevo. </string>
-  <string name="error_unable_to_stop_recording">No pude dejar de grabar. Por favor inténtelo de nuevo.</string>
+  <string name="error_no_location_manager">Ningún administrador de ubicación fue hallado en este dispositivo! </string>
+  <string name="error_no_gps_location_provider">Ningún proveedor de ubicación GPS fue hallado en este dispositivo.</string>
+  <string name="error_sending_to_fusiontables">Se produjo un error al enviar su recorrido a Google Fusion Tables.</string>
+  <string name="error_sending_to_docs">Se produjo un error al enviar su recorrido a Google Docs.</string>
+  <string name="error_unable_to_start_recording">No se puede iniciar la grabación. Inténtelo de nuevo. </string>
+  <string name="error_unable_to_stop_recording">No se puede detener la grabación. Inténtelo de nuevo.</string>
   <string name="error_unable_to_read_file">No pude leer del archivo.</string>
   <string name="error_invalid_gpx_format">El archivo no tiene un format GPX válido.</string>
-  <string name="error_generic">Error.  Por favor inténtelo de nuevo.</string>
+  <string name="error_generic">A ocurrido un error. Por favor, inténtelo de nuevo.</string>
   <string name="error_track_does_not_exist">El recorrido no existe.</string>
   <string name="error_out_of_memory">El archivo es demasiado grande (tiene que ser menor a 500 KB). Abortando.</string>
-  <string name="error_unable_to_insert_marker">No pude insertar la señal. La ubicación no esta disponible.</string>
+  <string name="error_unable_to_insert_marker">No se puede insertar el marcador. La ubicación no está disponible.</string>
 
   <!-- Status messages -->
   <string name="wait_for_fix">Esperando una ubicación mas exacta del GPS. Asegúrese que el cielo sea visible.</string>
   <string name="status_now_recording">Grabando un nuevo recorrido.</string>
-  <string name="status_stopped_recording">Grabacíon interrumpida.</string>
-  <string name="status_new_fusiontable_has_been_created">Un mapa Google Fusion Tables nuevo has sido creado en google.com/fusiontables.</string>
+  <string name="status_stopped_recording">Grabación interrumpida.</string>
+  <string name="status_new_fusiontable_has_been_created">Una nueva tabla de Google Fusion ha sido creada en google.com/fusiontables.</string>
   <string name="status_tracks_have_been_uploaded">Su recorrido ha sido enviado a maps.google.com.</string>
-  <string name="status_tracks_have_been_uploaded_to_new_doc">Su recorrido ha sido enviado a una nueva hoja de cálculo en docs.google.com.</string>
+  <string name="status_tracks_have_been_uploaded_to_new_doc">Su recorrido ha sido enviado a una nueva hoja de cálculo de docs.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_docs">Su recorrido ha sido enviado a docs.google.com.</string>
-  <string name="status_enable_gps">Por favor presione aquí para ir al menú de Seguridad y Ubicación y asegúrese que el GPS esté habilitado. Presione el botón de regreso para regresar.</string>
-  <string name="status_approximate_location">Nota: Una ubicación aproximada es mostrada, basada en informacion de torres de telefonía celular y red WIFI.</string>
-  <string name="status_no_location">La ubicación actual no puede ser determinada. Habilite más fuentes de datos (vea configuraciones de Seguridad y Ubicación) y asegúrese que el cielo sea visible. Inténtelo mas tarde.</string>
-  <string name="status_waypoint_inserted">Una señal de recorrido fue insertada.</string>
-  <string name="status_statistics_inserted">Una señal con estadísticas fue insertada.</string>
+  <string name="status_enable_gps">Por favor, presione aquí para ir al menú de Seguridad y Ubicación, y asegúrese que el GPS esté habilitado. Presione el botón "atrás" para regresar.</string>
+  <string name="status_approximate_location">Nota: Una ubicación aproximada es determinada a partir de torres de telefonía celular y redes WIFI.</string>
+  <string name="status_no_location">No puede ser determinada la ubicación actual. Habilite más fuentes de datos (vea las configuraciones de Seguridad y Ubicación) y asegúrese que el cielo sea visible. Inténtelo mas tarde.</string>
+  <string name="status_waypoint_inserted">Un marcador de recorrido fue insertado.</string>
+  <string name="status_statistics_inserted">Un marcador de estadísticas fue insertado.</string>
 
   <!-- Progress dialog -->
   <string name="progress_title">Por favor espere...</string>
@@ -212,7 +212,6 @@ limitations under the License.
   <string name="settings_backup_to_sd_summary">Hacer una copia total de sus recorridos y configuraciones a la tarjeta SD</string>
   <string name="settings_restore_from_sd">Restaurar</string>
   <string name="settings_restore_from_sd_summary">Restaurar todos los recorridos y configuraciones desde la tarjeta SD</string>
-  <string name="settings_no_backup_while_recording">No se pueden manejar backups mientras se está registrando un recorrido.</string>
 
   <string name="restore_overwrites_warning">Restaurar un backup desde la tarjeta SD SOBREESCRIBIRÁ todos sus recorridos y configuraciones actuales. ¿Está usted seguro?</string>
   <string name="select_backup_to_restore">Seleccionar el backup para restaurar</string>

MyTracks/res/values-fr/arrays.xml

@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Absent</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-    <item>60 min</item>
-  </string-array>
-
   <!-- Minimum recording distance -->
   <string-array name="min_recording_distance_options">
     <item>1 m</item>
@@ -112,10 +100,9 @@ limitations under the License.
     <item>3.1 miles (mauvais signal GPS)</item>
   </string-array>
 
-
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>Pas de séparation</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Absent</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -131,8 +118,8 @@ limitations under the License.
     <item>1 min</item>
   </string-array>
 
-  <string-array name="split_frequency_options_ft">
-    <item>Pas de séparation</item>
+  <string-array name="task_frequency_options_ft">
+    <item>Absent</item>
     <item>100 mi</item>
     <item>50 mi</item>
     <item>25 mi</item>
@@ -310,5 +297,5 @@ limitations under the License.
     <item>Pont SRM ANT+</item>
     <item>Bluetooth Zephyr</item>
   </array>
- 
+
 </resources>

MyTracks/res/values-fr/strings.xml

@@ -160,7 +160,7 @@ limitations under the License.
   <string name="settings_sharing">Partage</string>
 
   <string name="settings_announcement_frequency">Fréquence des annonces</string>
-  <string name="settings_announcement_frequency_summary">Temps minimum entre eux annonces vocales</string>
+  <string name="settings_announcement_frequency_summary">Temps minimum entre deux annonces vocales</string>
 
   <string name="settings_min_recording_distance">Distance min. entre 2 points</string>
   <string name="settings_min_recording_distance_summary">Plus petite distance entre deux enregistrements de votre position</string>
@@ -213,8 +213,6 @@ limitations under the License.
   <string name="settings_backup_to_sd_summary">Copier tous vos parcours et paramètres sur la carte SD</string>
   <string name="settings_restore_from_sd">Restaurer</string>
   <string name="settings_restore_from_sd_summary">Restaurer tous les parcours et paramètres depuis la carte SD</string>
-  <string name="settings_no_backup_while_recording">Sauvegarde impossible lors de l\'enregistrement d\'un parcours.</string>
-
 
   <string name="restore_overwrites_warning">Restaurer une sauvegarde depuis la carte SD écrasera tous vos parcours et paramètres actuels.</string>
   <string name="select_backup_to_restore">Choisissez la sauvegarde à restaurer</string>

MyTracks/res/values-it/arrays.xml

@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Disattivato</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-    <item>60 min</item>
-  </string-array>
-
   <!-- Minimum recording distance -->
   <string-array name="min_recording_distance_options">
     <item>1 m</item>
@@ -112,9 +100,9 @@ limitations under the License.
     <item>3.1 mi (segnale GPS debole)</item>
   </string-array>
 
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>Non dividere</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Disattivato</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -130,8 +118,8 @@ limitations under the License.
     <item>1 min</item>
   </string-array>
 
-  <string-array name="split_frequency_options_ft">
-    <item>Non dividere</item>
+  <string-array name="task_frequency_options_ft">
+    <item>Disattivato</item>
     <item>100 mi</item>
     <item>50 mi</item>
     <item>25 mi</item>

MyTracks/res/values-ja/arrays.xml

@@ -15,19 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>不使用</item>
-    <item>1 分</item>
-    <item>2 分</item>
-    <item>5 分</item>
-    <item>10 分</item>
-    <item>15 分</item>
-    <item>30 分</item>
-    <item>60 分</item>
-  </string-array>
-
- <!-- Minimum recording distance -->
+  <!-- Minimum recording distance -->
   <string-array name="min_recording_distance_options">
     <item>1 m</item>
     <item>2 m</item>
@@ -48,7 +36,6 @@ limitations under the License.
     <item>328 ft</item>
   </string-array>
 
-
   <!-- Maximum recording distance -->
   <string-array name="max_recording_distance_options">
     <item>50 m</item>
@@ -68,7 +55,6 @@ limitations under the License.
     <item>3.1 mi</item>
   </string-array>
 
-
   <!-- Minimum recording interval -->
   <string-array name="min_recording_interval_options">
     <item>電源節約 (動的制御)</item>
@@ -89,7 +75,6 @@ limitations under the License.
     <item>30 分</item>
   </string-array>
 
-
   <!-- Minimum required accuracy -->
   <string-array name="min_required_accuracy_options">
     <item>10 m (GPS信号強度良好)</item>
@@ -115,10 +100,9 @@ limitations under the License.
     <item>3.1 mi (GPS信号強度不良)</item>
   </string-array>
 
-
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>分割なし</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>不使用</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -134,8 +118,8 @@ limitations under the License.
     <item>1 分</item>
   </string-array>
 
-  <string-array name="split_frequency_options_ft">
-    <item>分割なし</item>
+  <string-array name="task_frequency_options_ft">
+    <item>不使用</item>
     <item>100 mi</item>
     <item>50 mi</item>
     <item>25 mi</item>
@@ -294,4 +278,5 @@ limitations under the License.
     <item>SRM ANT+ ブリッジ</item>
     <item>Zephyr Bluetooth</item>
   </array>
+
 </resources>

MyTracks/res/values-ja/strings.xml

@@ -154,7 +154,6 @@ limitations under the License.
   <string name="tracklist_clear_map">マップのクリア</string>
   <!-- Import All -->
   <string name="tracklist_btn_import_all">全てインポート</string>
-  <string name="import_done">インポート終了</string>
   <!-- Format:
   $1 : Successful imports
   $2 : Attempted imports
@@ -256,7 +255,6 @@ limitations under the License.
   <string name="settings_backup_to_sd_summary">SDカードに全てのトラックと設定をバックアップします</string>
   <string name="settings_restore_from_sd">今すぐ復元</string>
   <string name="settings_restore_from_sd_summary">SDカードから全てのトラックと設定を復元します</string>
-  <string name="settings_no_backup_while_recording">トラック記録中はバックアップ操作はできません．</string>
 
   <string name="restore_overwrites_warning">SDカードからの復元を実行すると、現在のトラックと設定は *全て上書き* されてしまいます．よろしいですか?</string>
   <string name="select_backup_to_restore">復元するバックアップの選択</string>

MyTracks/res/values-pl/arrays.xml

@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Brak</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-    <item>60 min</item>
-  </string-array>
-
   <!-- Minimum recording distance -->
   <string-array name="min_recording_distance_options">
     <item>1 m</item>
@@ -112,9 +100,9 @@ limitations under the License.
     <item>3.1 mili (słaby sygnał GPS)</item>
   </string-array>
 
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>Brak dzielenia</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Brak</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -130,8 +118,8 @@ limitations under the License.
     <item>1 min</item>
   </string-array>
 
-  <string-array name="split_frequency_options_ft">
-    <item>Brak dzielenia</item>
+  <string-array name="task_frequency_options_ft">
+    <item>Brak</item>
     <item>100 mi</item>
     <item>50 mi</item>
     <item>25 mi</item>
@@ -146,7 +134,7 @@ limitations under the License.
     <item>2 min</item>
     <item>1 min</item>
   </string-array>
-  
+
   <!-- Auto-resume track timeout -->
   <string-array name="auto_resume_track_timeout_options">
     <item>Nigdy</item>
@@ -162,7 +150,7 @@ limitations under the License.
     <item>typ mieszany</item>
     <item>inny</item>
 
-    <item>bieanie</item>
+    <item>bieganie</item>
     <item>bieganie uliczne</item>
     <item>bieganie na torze</item>
     <item>bieganie terenowe</item>
@@ -182,10 +170,10 @@ limitations under the License.
     <item>łyżwiarstwo torowe</item>
     <item>deskorolka</item>
 
-    <item>wędrówka po sniegu</item>
+    <item>wędrówka po śniegu</item>
     <item>narciarstwo</item>
     <item>snowboard</item>
-    <item>saneczkastwo</item>
+    <item>saneczkarstwo</item>
     <item>żeglarstwo lodowe</item>
 
     <item>żeglowanie</item>
@@ -249,7 +237,7 @@ limitations under the License.
     <item>kominek</item>
     <item>remiza strażacka</item>
     <item>baza wędkarska</item>
-    <item>stcja paliw</item>
+    <item>stacja paliw</item>
     <item>pole golfowe</item>
     <item>sklep spożywczy</item>
     <item>fryzjer</item>

MyTracks/res/values-pl/strings.xml

@@ -42,7 +42,7 @@ limitations under the License.
   <string name="error_invalid_gpx_format">Plik nie jest poprawnym plikiem GPX.</string>
   <string name="error_generic">Wystąpił błąd. Spróbuj ponownie.</string>
   <string name="error_track_does_not_exist">Trasa nie istnieje.</string>
-  <string name="error_out_of_memory">Plik jest za duży (musi być mniejszy nić 500 KB). Przerywam.</string>
+  <string name="error_out_of_memory">Plik jest za duży (musi być mniejszy niż 500 KB). Przerywam.</string>
   <string name="error_unable_to_insert_marker">Nie można wstawić markera. Brak poprawnych danych o lokalizacji.</string>
 
   <!-- Status messages -->
@@ -217,7 +217,6 @@ limitations under the License.
   <string name="settings_backup_to_sd_summary">Tworzy kopię zapasową wszystkich tras i ustawień i zapisuje je na karcie SD</string>
   <string name="settings_restore_from_sd">Odtwórz z kopii</string>
   <string name="settings_restore_from_sd_summary">Odtwarza wszystkie trasy i ustawienia z kopii zapasowej z karty SD</string>
-  <string name="settings_no_backup_while_recording">Nie można tworzyć/odtwarzać kopii zapasowej podczas rejestrowania trasy.</string>
 
   <!-- Backups -->
   <string name="restore_overwrites_warning">Odtworzenie z kopii zapasowej z karty SD zastąpi wszystkie bieżące trasy i ustawienia. Jesteś tego pewien?</string>
@@ -335,7 +334,6 @@ limitations under the License.
   <string name="about_team">Zespół:</string>
   <string name="about_version">Wersja:</string>
   <string name="about_support">Wsparcie:</string>
-  <string name="about_bart">Bartłomiej Niechwiej</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Wyślij do...</string>
@@ -386,4 +384,31 @@ limitations under the License.
   <!-- Check Units -->
   <string name="check_units_title">Jednostki miary</string>
   <string name="check_units_message">Domyślnie używane są jednostki metryczne. Chcesz to zmienić?</string>
+  
+  <!-- Fake preference keys - never saved, but show options in the preferences screen -->
+  <string name="method_bluetooth">Bluetooth</string>
+  <string name="bluetooth_options">Opcje Bluetooth</string>
+  <string name="bluetooth_pairing">Parowanie urządzenia</string>
+  <string name="bluetooth_pairing_summary">Przejdź do ustawień Bluetooth Androida aby sparować urządzenie</string>
+  <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
+  <string name="ant_options">Opce ANT</string>
+  <string name="sensor_options">Opcje Czujników</string>
+
+  <!-- Bluetooth Sensor -->
+  <string name="bluetooth_connected">Połączony z %s</string>
+  <string name="bluetooth_connecting">Łączenie urządzenia Bluetooth w toku...</string>
+  <string name="bluetooth_not_connected">Urządzenie Bluetooth niepołączone</string>
+
+  <!-- Sensor State -->
+  <string name="sensor_data_time">Czas Danych Czujnika</string>
+  <string name="power_meter_enabled">Miernik mocy aktywny</string>
+  <string name="heart_rate_monitor_enabled">Pulsometr aktywny</string>
+  <string name="no_sensor_manager">Brak Ustawień Czujników</string>
+  <string name="enabled">Aktywny</string>
+  <string name="connecting">Łączenie</string>
+  <string name="connected">Podłączony</string>
+  <string name="disconnected">Rozłączony</string>
+  <string name="no_sensor_service">Brak Serwisu Czujników</string>
+  <string name="searching">Wykrywanie</string>
+  <string name="sending">Przesyłanie</string>
 </resources>

MyTracks/res/values-pt-rBR/arrays.xml

@@ -15,21 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Task frequency -->
-  <array name="task_frequency_options">
-    <item>Desligado</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-    <item>60 min</item>
-  </array>
-
-
   <!-- Minimum recording distance -->
-  <array name="min_recording_distance_options">
+  <string-array name="min_recording_distance_options">
     <item>1 m</item>
     <item>2 m</item>
     <item>3 m</item>
@@ -37,9 +24,9 @@ limitations under the License.
     <item>5 m (recomendada)</item>
     <item>10 m</item>
     <item>100 m</item>
-  </array>
+  </string-array>
 
-  <array name="min_recording_distance_options_ft">
+  <string-array name="min_recording_distance_options_ft">
     <item>3 pés</item>
     <item>6 pés</item>
     <item>10 pés</item>
@@ -47,31 +34,29 @@ limitations under the License.
     <item>16 pés (recomendado)</item>
     <item>33 pés</item>
     <item>328 pés</item>
-  </array>
-
+  </string-array>
 
   <!-- Maximum recording distance -->
-  <array name="max_recording_distance_options">
+  <string-array name="max_recording_distance_options">
     <item>50 m</item>
     <item>100 m</item>
     <item>200 m (recomendado)</item>
     <item>500 m</item>
     <item>1000 m</item>
     <item>5000 m</item>
-  </array>
+  </string-array>
 
-  <array name="max_recording_distance_options_ft">
+  <string-array name="max_recording_distance_options_ft">
     <item>164 pés</item>
     <item>328 pés</item>
     <item>656 pés (recomendado)</item>
     <item>1640 pés</item>
     <item>0.6 milhas</item>
     <item>3.1 milhas</item>
-  </array>
-
+  </string-array>
 
   <!-- Minimum recording interval -->
-  <array name="min_recording_interval_options">
+  <string-array name="min_recording_interval_options">
     <item>economia de bateria (adaptativo)</item>
     <item>alta precisão (adaptativo)</item>
     <item>máxima (recomendada)</item>
@@ -88,11 +73,10 @@ limitations under the License.
     <item>10 min</item>
     <item>15 min</item>
     <item>30 min</item>
-  </array>
-
+  </string-array>
 
   <!-- Minimum required accuracy -->
-  <array name="min_required_accuracy_options">
+  <string-array name="min_required_accuracy_options">
     <item>10 m (sinal de GPS excelente)</item>
     <item>20 m</item>
     <item>50 m</item>
@@ -102,9 +86,9 @@ limitations under the License.
     <item>1000 m</item>
     <item>2000 m</item>
     <item>5000 m (sinal de GPS ruim)</item>
-  </array>
+  </string-array>
 
-  <array name="min_required_accuracy_options_ft">
+  <string-array name="min_required_accuracy_options_ft">
     <item>33 pés (sinal de GPS excelente)</item>
     <item>66 pés</item>
     <item>165 pés</item>
@@ -114,12 +98,11 @@ limitations under the License.
     <item>0.6 milhas</item>
     <item>1.2 milhas</item>
     <item>3.1 milhas (sinal de GPS ruim)</item>
-  </array>
+  </string-array>
 
-
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>Sem divisões</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Desligado</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -135,8 +118,8 @@ limitations under the License.
     <item>1 min</item>
   </string-array>
 
-  <string-array name="split_frequency_options_ft">
-    <item>Sem divisões</item>
+  <string-array name="task_frequency_options_ft">
+    <item>Desligado</item>
     <item>100 mi</item>
     <item>50 mi</item>
     <item>25 mi</item>

MyTracks/res/values-pt-rBR/strings.xml

@@ -96,6 +96,7 @@ limitations under the License.
   <!-- Common -->
   <string name="no">Não</string>
   <string name="yes">Sim</string>
+  <!-- KEEP_PARENT name="ok" rev="7cbb95c69f35" -->
   <string name="error">Erro</string>
   <string name="success">Successo</string>
   <string name="waypoint">Ponto de passagem</string>
@@ -157,6 +158,8 @@ limitations under the License.
   <string name="settings_display">Exibição</string>
   <string name="settings_recording">Gravação</string>
   <string name="settings_sharing">Compartilhamento</string>
+  <string name="settings_not_available_summary">Não disponível na sua versão do Android</string>
+  <string name="settings_not_while_recording">Não disponível durante a gravação de uma trilha</string>
   <string name="settings_announcement_frequency">Tempo entre anúncios</string>
   <string name="settings_announcement_frequency_summary">Tempo mínimo entre dois anúncios de voz</string>
   <string name="settings_min_recording_distance">Dist. mín. entre pontos</string>

MyTracks/res/values-ru/arrays.xml

@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+<resources>
+  <!-- Minimum recording distance -->
+  <string-array name="min_recording_distance_options">
+    <item>1 м</item>
+    <item>2 м</item>
+    <item>3 м</item>
+    <item>4 м</item>
+    <item>5 м (рекомендуется)</item>
+    <item>10 м</item>
+    <item>100 м</item>
+  </string-array>
+
+  <string-array name="min_recording_distance_options_ft">
+    <item>3 фута</item>
+    <item>6 футов</item>
+    <item>10 футов</item>
+    <item>13 футов</item>
+    <item>16 футов (рекомендуется)</item>
+    <item>33 фута</item>
+    <item>328 футов</item>
+  </string-array>
+
+  <!-- Maximum recording distance -->
+  <string-array name="max_recording_distance_options">
+    <item>50 м</item>
+    <item>100 м</item>
+    <item>200 м (рекомендуется)</item>
+    <item>500 м</item>
+    <item>1000 м</item>
+    <item>5000 м</item>
+  </string-array>
+
+  <string-array name="max_recording_distance_options_ft">
+    <item>164 фута</item>
+    <item>328 футов</item>
+    <item>656 фута (рекомендуется)</item>
+    <item>1640 футов</item>
+    <item>0,6 мили</item>
+    <item>3,1 мили</item>
+  </string-array>
+
+  <!-- Minimum recording interval -->
+  <string-array name="min_recording_interval_options">
+    <item>экономия батареи (адаптивная)</item>
+    <item>высокая точность (адаптивная)</item>
+    <item>высочайшая точность (рекомендуется)</item>
+    <item>2 с</item>
+    <item>3 с</item>
+    <item>4 с</item>
+    <item>5 с</item>
+    <item>10 с</item>
+    <item>20 с</item>
+    <item>30 с</item>
+    <item>1 мин</item>
+    <item>2 мин</item>
+    <item>5 мин</item>
+    <item>10 мин</item>
+    <item>15 мин</item>
+    <item>30 мин</item>
+  </string-array>
+
+  <!-- Minimum required accuracy -->
+  <string-array name="min_required_accuracy_options">
+    <item>10 м (отличный сигнал GPS)</item>
+    <item>20 м</item>
+    <item>50 м</item>
+    <item>100 м</item>
+    <item>200 м (рекомендуется)</item>
+    <item>500 м</item>
+    <item>1000 м</item>
+    <item>2000 м</item>
+    <item>5000 м (плохой сигнал GPS)</item>
+  </string-array>
+
+  <string-array name="min_required_accuracy_options_ft">
+    <item>33 фута (отличный сигнал GPS)</item>
+    <item>66 футов</item>
+    <item>165 футов</item>
+    <item>328 футов</item>
+    <item>656 футов (рекомендуется)</item>
+    <item>1640 футов</item>
+    <item>0,6 мили</item>
+    <item>1,2 мили</item>
+    <item>3,1 мили (плохой сигнал GPS)</item>
+  </string-array>
+
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Выкл.</item>
+    <item>100 км</item>
+    <item>50 км</item>
+    <item>25 км</item>
+    <item>10 км</item>
+    <item>5 км</item>
+    <item>1 км</item>
+    <item>60 мин</item>
+    <item>30 мин</item>
+    <item>15 мин</item>
+    <item>10 мин</item>
+    <item>5 мин</item>
+    <item>2 мин</item>
+    <item>1 мин</item>
+  </string-array>
+
+  <string-array name="task_frequency_options_ft">
+    <item>Выкл.</item>
+    <item>100 миль</item>
+    <item>50 миль</item>
+    <item>25 миль</item>
+    <item>10 миль</item>
+    <item>5 миль</item>
+    <item>1 миля</item>
+    <item>60 мин</item>
+    <item>30 мин</item>
+    <item>15 мин</item>
+    <item>10 мин</item>
+    <item>5 мин</item>
+    <item>2 мин</item>
+    <item>1 мин</item>
+  </string-array>
+
+  <!-- Auto-resume track timeout -->
+  <string-array name="auto_resume_track_timeout_options">
+    <item>Никогда</item>
+    <item>5 мин</item>
+    <item>10 мин</item>
+    <item>15 мин</item>
+    <item>Всегда</item>
+  </string-array>
+
+  <!-- Other non-preference arrays -->
+  <array name="activity_types">
+    <item>не определен</item>
+    <item>смешанного типа</item>
+    <item>другое</item>
+
+    <item>бег</item>
+    <item>бег по улице</item>
+    <item>бег по треку</item>
+    <item>бег по тропе</item>
+    <item>ходьба</item>
+    <item>быстрая ходьба</item>
+    <item>пешая прогулка</item>
+    <item>прогулка по туристической тропе</item>
+    <item>прогулка по бездорожью</item>
+    <item>восхождение</item>
+
+    <item>велосипедная прогулка</item>
+    <item>шоссейный велосипед</item>
+    <item>горный велосипед</item>
+    <item>велотрек</item>
+
+    <item>катание на коньках</item>
+    <item>катания на роликовых коньках</item>
+    <item>катания на роликовых коньках</item>
+
+    <item>прогулка на снегоступах</item>
+    <item>лыжи</item>
+    <item>сноубординг</item>
+    <item>сани</item>
+    <item>ледяной парусный спорт</item>
+
+    <item>парусный спорт</item>
+    <item>гребля</item>
+    <item>каякинг</item>
+    <item>академическая гребля</item>
+    <item>моторная лодка</item>
+    <item>паром</item>
+    <item>RC лодка</item>
+    <item>серфинг</item>
+    <item>виндсерфинг</item>
+    <item>кайтсерфинг</item>
+    <item>водные лыжи</item>
+    <item>вейкбординг</item>
+
+    <item>самолет</item>
+    <item>гидроплан</item>
+    <item>коммерческий самолет</item>
+    <item>вертолет</item>
+    <item>воздушный шар</item>
+    <item>дирижабль</item>
+    <item>RC самолет</item>
+    <item>RC вертолет</item>
+    <item>прыжки</item>
+    <item>планеризм</item>
+    <item>дельтаплан</item>
+    <item>парный планеризм</item>
+
+    <item>верховая езда</item>
+    <item>катание на лошадях</item>
+    <item>прогулка на осле</item>
+
+    <item>вождение автомобиля</item>
+    <item>вождение автобуса</item>
+    <item>поезд</item>
+    <item>мотоцикл</item>
+    <item>Байк</item>
+    <item>ATV</item>
+
+    <item>парусный спорт на земле</item>
+    <item>фрисби</item>
+    <item>алтимат фризби</item>
+  </array>
+
+  <array name="waypoint_types">
+    <item>банкомат</item>
+    <item>банк</item>
+    <item>бар</item>
+    <item>барбекю</item>
+    <item>здание</item>
+    <item>автобусная остановка</item>
+    <item>кафе</item>
+    <item>костер</item>
+    <item>лагерь</item>
+    <item>церковь</item>
+    <item>кофейня</item>
+    <item>удобный магазин</item>
+    <item>питьевая вода</item>
+    <item>оползень</item>
+    <item>паром</item>
+    <item>камин</item>
+    <item>пожарная станция</item>
+    <item>рыболовство</item>
+    <item>автозаправочная станция</item>
+    <item>поле для гольфа</item>
+    <item>продуктовый магазин</item>
+    <item>парикмахерская</item>
+    <item>гавань</item>
+    <item>тропа</item>
+    <item>отель</item>
+    <item>дом</item>
+    <item>информация</item>
+    <item>пересечение</item>
+    <item>почтовый ящик</item>
+    <item>рынок</item>
+    <item>место встречи</item>
+    <item>опера</item>
+    <item>парковка</item>
+    <item>почтовое отделение</item>
+    <item>выбоина</item>
+    <item>полицейский участок</item>
+    <item>железнодорожный переезд</item>
+    <item>ресторан</item>
+    <item>покупки</item>
+    <item>вид</item>
+    <item>магазин</item>
+    <item>бассейн</item>
+    <item>телефон</item>
+    <item>театр</item>
+    <item>туалет</item>
+    <item>туристическая информация</item>
+    <item>туннель</item>
+    <item>дерево</item>
+    <item>водопад</item>
+    <item>фонтан</item>
+    <item>путевая точка</item>
+  </array>
+
+  <array name="sensor_type_options">
+    <item>Нет</item>
+    <item>ANT+ Sensors</item>
+    <item>SRM ANT+ Bridge</item>
+    <item>Zephyr Bluetooth</item>
+  </array>
+
+</resources>

MyTracks/res/values-ru/strings.xml

@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+<resources>
+  <!-- Used by the Menu -->
+  <string name="start_recording">Запись трека</string>
+  <string name="stop_recording">Остановить запись</string>
+  <string name="switch_to_sat">Режим спутника</string>
+  <string name="switch_to_map">Режим карты</string>
+  <string name="mylocation">Мое местоположение</string>
+  <string name="list_tracks">Треки</string>
+  <string name="list_markers">Маркеры</string>
+  <string name="delete_all_tracks">Удалить все треки</string>
+  <string name="settings">Настройки</string>
+  <string name="elevation">Высота</string>
+  <string name="choose_track_message">Пожалуйста, выберите трек для просмотра</string>
+  <string name="current_track">Текущий трек</string>
+  <string name="current_segment">Последний сегмент</string>
+  <string name="sensor_state">Состояние датчика</string>
+  <string name="aggregated_stats">Совокупная статистика</string>
+
+  <!-- Error messages -->
+  <string name="error_no_location_manager">На этом устройстве не был обнаружен диспетчер местоположения!</string>
+  <string name="error_no_gps_location_provider">На этом устройстве не был обнаружен поставщик GPS местоположения.</string>
+  <string name="error_sending_to_mymap">Ошибка при отправке вашего трека в Google \"Мои карты\".</string>
+  <string name="error_sending_to_fusiontables">Ошибка при отправке вашего трека в Google Fusion Tables.</string>
+  <string name="error_sending_to_docs">Ошибка при отправке вашего трека в Google Документы.</string>
+  <string name="error_please_try_again_later">Пожалуйста, повторите попытку позже.</string>
+  <string name="error_unable_to_start_recording">Не удалось начать запись. Попробуйте еще раз.</string>
+  <string name="error_unable_to_stop_recording">Не удалось остановить запись. Попробуйте еще раз.</string>
+  <string name="error_unable_to_read_file">Не удалось прочитать из файла.</string>
+  <string name="error_invalid_gpx_format">Неверный формат GPX файла.</string>
+  <string name="error_generic">Произошла ошибка. Пожалуйста, попробуйте еще раз.</string>
+  <string name="error_track_does_not_exist">Трек не существует.</string>
+  <string name="error_out_of_memory">Этот файл слишком большой (должен быть меньше, чем 500 КБ). Прервано.</string>
+  <string name="error_unable_to_insert_marker">Невозможно вставить маркер. Местоположение неизвестно.</string>
+
+  <!-- Status messages -->
+  <string name="wait_for_fix">Ожидание сигнала GPS. Убедитесь в том, что вы находитесь под открытым небом.</string>
+  <string name="status_now_recording">Записывается новый трек.</string>
+  <string name="status_stopped_recording">Запись вашего трека остановлена.</string>
+  <string name="status_new_mymap_has_been_created">Новая Google \"Мои карты\" была создана на maps.google.com.</string>
+  <string name="status_new_fusiontable_has_been_created">Новая таблица Google Fusion была создана на google.com/fusiontables.</string>
+  <string name="status_tracks_have_been_uploaded">Твой трек был отправлен на maps.google.com.</string>
+  <string name="status_tracks_have_been_uploaded_to_new_doc">Ваш трек был отправлен в новую электронную таблицу на docs.google.com.</string>
+  <string name="status_tracks_have_been_uploaded_to_docs">Ваш трек был отправлен в docs.google.com.</string>
+  <string name="status_mymap_info">Это может занять несколько минут, прежде чем появятся новые треки.</string>
+  <string name="status_enable_gps">Пожалуйста, нажмите здесь для перехода к разделу настроек Координаты и отметьте пункт \"Спутники GPS\". Для возвращения нажмите кнопку Назад.</string>
+  <string name="status_approximate_location">Примечание: приблизительное местоположение определено относительно вышек сотовой связи и беспроводных сетей.</string>
+  <string name="status_no_location">В настоящее время местоположение не может быть определено. Включите больше источников местоположение (см. раздел настроек Координаты) и убедитесь в том, что находитесь под открытым небом. Повторите попытку позднее.</string>
+  <string name="status_waypoint_inserted">Маркер путевой точки был вставлен.</string>
+  <string name="status_statistics_inserted">Маркер статистики был вставлен.</string>
+  <string name="status_track_upload_status">Статус загрузки:</string>
+
+  <!-- Progress dialog -->
+  <string name="progress_title">Пожалуйста, подождите...</string>
+  <string name="progress_message">Отправка вашего трека в Google.</string>
+  <string name="progress_message_reading_track">Чтение трека...</string>
+  <string name="progress_message_preparing_track">Подготовка трека...</string>
+  <string name="progress_message_authenticating_fusiontables">Аутентификация на Google Fusion Tables...</string>
+  <string name="progress_message_authenticating_mymaps">Аутентификация на Google Карты...</string>
+  <string name="progress_message_authenticating_docs">Аутентификация в Google Документы...</string>
+  <string name="progress_message_sending_docs">Отправка трека в Google Документы...</string>
+  <string name="progress_message_sending_mymaps">Отправка трека в Google Карты...</string>
+  <string name="progress_message_creating_map">Создание новой \"Моей карты\" ...</string>
+  <string name="progress_message_sending_fusiontables">Отправка трека в Fusion Tables...</string>
+  <string name="progress_message_creating_fusiontable">Создание новой Fusion table...</string>
+  <string name="import_progress_message">Импорт GPS трека. Это может занять некоторое время.</string>
+  <string name="write_progress_message">Запись файла на SD карту. Это может занять некоторое время.</string>
+  <string name="progress_message_updating_track">Обновление статистики трека...</string>
+
+  <!-- Used by DeleteAllDataHandler -->
+  <string name="are_you_sure_question">Вы уверены?</string>
+  <string name="all_data_will_be_permanently_deleted">Все треки и маркеры будут удалены с этого телефона.</string>
+  <string name="track_will_be_permanently_deleted">Трек и его маркеры будут удалены из этого телефона.</string>
+  <string name="marker_will_be_permanently_deleted">Маркер будет удален с этого телефона.</string>
+
+  <!-- Text and links when uploading to Google Fusion Tables -->
+  <string name="new_map_description">Создано My Tracks на Android.</string>
+  <string name="fusiontable_link">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
+
+  <!-- Text and links when uploading to Google My Maps -->
+  <string name="my_map_link">Создано &lt;a href=\'http://mytracks.appspot.com\'&gt;My Tracks&lt;/a&gt; на Android.</string>
+  <string name="new_map_title">Новая карта</string>
+
+  <!-- Formatting of track and marker descriptions -->
+  <string name="points">Точки</string>
+  <string name="recorded_date">Записан</string>
+  <string name="category">Тип деятельности</string>
+  <string name="waypoint_category">Тип маркера</string>
+  <string name="part">(Часть %d)</string>
+
+  <!-- Used by the track recording service -->
+  <string name="recording_your_track">Запись трека...</string>
+  <string name="new_track">Трек %d</string>
+
+  <!-- Common -->
+  <string name="no">Нет</string>
+  <string name="yes">Да</string>
+  <string name="ok">ОК</string>
+  <string name="error">Ошибка</string>
+  <string name="success">Готово</string>
+  <string name="waypoint">Путевая точка</string>
+  <string name="license">Лицензия</string>
+  <string name="cancel">Отмена</string>
+  <string name="close">Закрыть</string>
+  <string name="edit">Правка</string>
+  <string name="save">Сохранить</string>
+
+  <!-- Placemark labels for start and end of track -->
+  <string name="start">(Старт)</string>
+  <string name="end">(Конец)</string>
+
+  <!--  TrackList -->
+  <string name="tracklist_show_track">Показать</string>
+  <string name="tracklist_send_to_mymaps">Отправить в Google \"Мои карты\"</string>
+  <string name="tracklist_send_to_new_mymap">Отправить в новый Google \"Мои карты\"</string>
+  <string name="tracklist_send_to_fusiontables">Отправить в Google Fusion Tables</string>
+  <string name="tracklist_send_to_new_fusiontable">Отправить в новую Google Fusion Table</string>
+  <string name="tracklist_send_to_docs">Отправить в Google Документы</string>
+  <string name="tracklist_send_to_google">Отправить в Google ...</string>
+  <string name="tracklist_delete_track">Удалить из телефона...</string>
+  <string name="tracklist_edit_track">Править детали</string>
+  <string name="tracklist_write_to_sd">Записать на SD карту...</string>
+  <string name="tracklist_save_as_gpx">Сохранить файл GPX</string>
+  <string name="tracklist_save_as_kml">Сохранить файл KML</string>
+  <string name="tracklist_save_as_csv">Сохранить файл CSV</string>
+  <string name="tracklist_save_as_tcx">Сохранить файл TCX</string>
+  <string name="tracklist_btn_send_all_to_fusiontables">Отправить в Google Fusion Tables</string>
+  <string name="tracklist_btn_send_all_to_mymaps">Отправить в Google \"Мои карты\"</string>
+  <string name="tracklist_btn_delete_all">Удалить все</string>
+  <!-- Export All -->
+  <string name="tracklist_btn_export_all">Экспорт всех</string>
+  <string name="export_done">Экспорт закончен</string>
+  <string name="tracklist_pick_one">Выберите трек. Нажмите и удерживайте для получения дополнительных возможностей.</string>
+  <string name="tracklist_all_tracks">Все треки:</string>
+  <string name="tracklist_this_track">Этот трек</string>
+  <string name="tracklist_share_track">Поделиться с друзьями...</string>
+  <string name="tracklist_share_link">Ссылка на карту</string>
+  <string name="tracklist_share_gpx_file">Файл GPX</string>
+  <string name="tracklist_share_kml_file">Файл KML</string>
+  <string name="tracklist_share_csv_file">Файла CSV</string>
+  <string name="tracklist_share_tcx_file">Файл TCX</string>
+  <string name="tracklist_clear_map">Очистить карту</string>
+  <!-- Import All -->
+  <string name="tracklist_btn_import_all">Импорт всех</string>
+  <!-- Format:
+  $1 : Successful imports
+  $2 : Attempted imports
+  $3 : MyTracks gpx path
+  -->
+  <string name="import_done">Импортировано %1$d из %2$d GPX файлов с %3$s</string>
+  <string name="import_empty">GPX файлы не найденны в %s. Возможно не читается SD-карта или каталог не содержит GPX файлы.</string>
+  <string name="import_error">Ошибка импорта файла %s</string>
+
+  <!-- Waypoints list -->
+  <string name="waypointslist_btn_delete_all">Удалить все маркеры</string>
+  <string name="waypointslist_this_waypoint">Этот маркер</string>
+  <string name="waypointslist_delete_waypoint">Удалить</string>
+  <string name="waypointslist_edit_waypoint">Править детали</string>
+  <string name="waypointslist_show_waypoint">Показать на карте</string>
+  <string name="waypointslist_btn_insert_waypoint">Вставить путевую точку</string>
+  <string name="waypointslist_btn_insert_statistics">Вставить статистику</string>
+  <string name="waypointslist_pick_one">Выберите маркер. Нажмите и удерживайте для получения дополнительных возможностей.</string>
+
+  <!-- MyTracks Details -->
+  <string name="trackdetails_title">Трек детали</string>
+  <string name="trackdetails_name">Название трека</string>
+  <string name="trackdetails_description">Описание трека</string>
+  <string name="trackdetails_category">Тип деятельности (например: пешая прогулка, велосипедная прогулка, бег, восхождение...)</string>
+
+  <!-- MyTracks Waypoint Details -->
+  <string name="waypointdetails_title">Маркер детали</string>
+  <string name="waypointdetails_name">Имя маркера</string>
+  <string name="waypointdetails_description">Описание маркера</string>
+  <string name="waypointdetails_category">Тип маркера (например: здание, выбоина, достопримечательность...)</string>
+
+  <!-- MyTracks Settings -->
+  <string name="mytracks_settings">Настройки My Tracks</string>
+  <string name="settings_display">Отображение</string>
+  <string name="settings_recording">Запись</string>
+  <string name="settings_sharing">Обмен</string>
+
+  <string name="settings_not_available_summary">Не доступен в вашем версии Android</string>
+  <string name="settings_not_while_recording">Не доступно во время записи трека</string>
+
+  <string name="settings_announcement_frequency">Частота объявлений</string>
+  <string name="settings_announcement_frequency_summary">Минимальное время между двумя голосовыми объявлениями</string>
+
+  <string name="settings_min_recording_distance">Минимальное расстояние между точками</string>
+  <string name="settings_min_recording_distance_summary">Наименьшее расстояние между двумя записями вашей позиции</string>
+
+  <string name="settings_max_recording_distance">Максимальное расстояние между точками</string>
+  <string name="settings_max_recording_distance_summary">Если два пункта находятся дальше, чем указано, то трек будет разделен</string>
+
+  <string name="settings_min_recording_interval">Минимальное время между точками</string>
+  <string name="settings_min_recording_interval_summary">Наименьший интервал времени между двумя записями вашей позиции</string>
+
+  <string name="settings_min_required_accuracy">Минимальная точность</string>
+  <string name="settings_min_required_accuracy_summary">Запись будет приостановлена, если ваша позиция не является достаточно точной</string>
+
+  <string name="settings_metric_units">Использовать метрические единицы</string>
+  <string name="settings_metric_units_summary_on">Все расстояния будут отображаться в метрических единицах</string>
+  <string name="settings_metric_units_summary_off">Все расстояния будут отображаться в имперских единицах</string>
+
+  <string name="settings_map_public">Обнародовать карты</string>
+  <string name="settings_map_public_summary_on">Загруженные карты будут общедоступны на maps.google.com</string>
+  <string name="settings_map_public_summary_off">Загруженные карты не будут перечислены публично на maps.google.com</string>
+
+  <string name="settings_report_speed_or_pace">Отображать скорость</string>
+  <string name="settings_report_speed_or_pace_summary_on">Скорость будет отображаться</string>
+  <string name="settings_report_speed_or_pace_summary_off">Темп будет отображаться</string>
+
+  <string name="settings_share_url_only">Поделиться только URL</string>
+  <string name="settings_share_url_only_summary_on">При обмене будет отправлен только URL-адрес</string>
+  <string name="settings_share_url_only_summary_off">Содержимое трека будет также включено при обмене</string>
+
+  <string name="settings_split_frequency">Частота деления</string>
+  <string name="settings_split_frequency_summary">Максимальное время или расстояние, после которого будет вставлен новый маркер деления</string>
+
+  <string name="settings_auto_resume_track_timeout">Автоматическое возобновление трек тайм-аут</string>
+  <string name="settings_auto_resume_track_timeout_summary">Максимальное время в минутах, после которого предыдущая запись трека не будет возобновлена на перезагруженном телефоне</string>
+
+  <string name="settings_timestamp_track_name">Штамп времени как название дорожки</string>
+  <string name="settings_timestamp_track_name_summary_on">По умолчанию имя трека будет складываться из даты и времени старта трека</string>
+  <string name="settings_timestamp_track_name_summary_off">Названия треков будут иметь прирост чисел для каждого нового трека.</string>
+
+  <string name="settings_reset">Восстановить значения по умолчанию</string>
+  <string name="settings_reset_summary">Восстановить значения по умолчанию во всех настройках</string>
+  <string name="settings_reset_dialog_message">Все ваши настройки будут стерты и восстановлены значения по умолчанию. Записанные треки будут сохранены. Вы уверены?</string>
+  <string name="settings_reset_done">Все настройки были возвращены к значениям по умолчанию.</string>
+
+  <string name="pace_label">Темп</string>
+
+  <string name="eclair_required">Поддерживается только в Android 2.0 или выше</string>
+  <string name="settings_sensor_type">Тип датчика</string>
+  <string name="settings_sensor_type_summary">Тип подключенного датчика</string>
+  <string name="settings_heart_rate_ant_sensor_id">Очистить ANT подсоединенного датчика пульса</string>
+  <string name="settings_power_ant_sensor_id">Очистить ANT подсоединенного датчика мощности</string>
+  <string name="settings_srm_bridge_ant_sensor_id">Очистить ANT подсоединенного датчика SRM</string>
+  <string name="settings_ant_not_paired">ANT датчик не подсоединен</string>
+  <string name="settings_ant_paired">ANT датчик подсоединен с: %d</string>
+  <string name="bluetooth_sensor_title">Bluetooth датчик</string>
+  <string name="bluetooth_sensor_summary">Подключенный bluetooth датчик</string>
+  <string name="settings_modular_stats_display_title">Отображение модульной статистики</string>
+
+  <!-- Backups -->
+  <string name="settings_backup">Резервное копирование (BETA)</string>
+  <string name="settings_sd_backup">Резервное копирование SD карты</string>
+  <string name="settings_backup_to_sd">Резервировать</string>
+  <string name="settings_backup_to_sd_summary">Создать полную копию всех ваших треков и настроек на SD карту</string>
+  <string name="settings_restore_from_sd">Восстановить</string>
+  <string name="settings_restore_from_sd_summary">Восстановить все треки и параметры с SD карты</string>
+
+  <string name="restore_overwrites_warning">Восстановление резервной копии с SD карты ПЕРЕЗАПИШЕТ все текущие треки и настройки. Вы уверены?</string>
+  <string name="select_backup_to_restore">Выберите резервную копию для восстановления</string>
+  <string name="no_backups">Резервные копии не найдены.</string>
+  <string name="backup_write_progress_message">Запись на SD-карту всех треков и настроек. Это может занять некоторое время...</string>
+  <string name="backup_import_progress_message">Чтение всех треков и настроек с SD-карты. Это может занять некоторое время...</string>
+
+  <!-- MyTracksSky -->
+  <string name="mytracks_sky">Спутники GPS</string>
+
+  <!-- My Maps -->
+  <string name="select_map_message">Выберите карту из вашей учетной записи:</string>
+  <string name="create_new_map">Создать новую карту...</string>
+  <string name="map_list_title">Отправить в Google \"Мои карты\"</string>
+  <string name="maps_list_loading">Загрузка карты ...</string>
+  <string name="maps_list_failed">Ваши карты не могут быть загружены в данный момент!</string>
+  <string name="open_map">Выберите эту карту</string>
+  <string name="edit_map_details">Править детали карты</string>
+  <string name="share_track">Поделиться треком</string>
+  <string name="delete_map">Удалить Карту из вашей учетной записи</string>
+  <string name="map_title">Название карты:</string>
+  <string name="map_description">Описание карты:</string>
+  <string name="map_searchable_edit">Сделать чтобы карта и ее содержимое отображались в результатах поиска</string>
+  <string name="map_not_searchable_edit">Не позволить этой карте или ее содержимому отображаться в результатах поиска, хотя они все еще могут просматриваться другими через прямой URL-адрес</string>
+  <string name="map_searchable">Эта карта и ее содержимое будут отображаться в результатах поиска</string>
+  <string name="map_not_searchable">Ни эта карта, ни ее содержимое не будут отображаться в результатах поиска, но их могут по-прежнему просматривать другие через прямую ссылку</string>
+
+  <!-- Sharing -->
+  <string name="share_map">Поделиться картой с друзьями</string>
+  <string name="share_map_subject">Я хотел бы поделиться с вами треком</string>
+  <string name="share_map_body_format">Я думаю, вы можете быть заинтересованы в этом треке:
+
+%s</string>
+  <string name="send_track_subject">Я хотел бы поделиться с вами треком</string>
+  <string name="send_track_body_format">Я думаю, вы можете быть заинтересованы в этом треке.
+
+Просмотреть трек можно с помощью Google Планета Земля или другого программного обоспечения для карт.</string>
+
+  <!-- Visibility -->
+  <string name="public_map">Общественные</string>
+  <string name="unlisted_map">Частные</string>
+  <string name="mapslist_no_maps_available">У вас пока еще нет карт.</string>
+
+  <!-- Statistics View -->
+  <!-- Average Moving -->
+  <string name="average_moving_speed_label">Средняя скорость движения</string>
+  <string name="average_moving_pace_label">Средний темп движения</string>
+
+  <!-- Average -->
+  <string name="average_speed_label">Средняя скорость</string>
+  <string name="average_pace_label">Средний темп</string>
+
+  <string name="elevation_chart_name">Диаграмма высоты</string>
+  <string name="elevation_gain_label">Набор высоты</string>
+  <string name="elevation_label">Высота</string>
+  <string name="latitude_label">Широта</string>
+  <string name="longitude_label">Долгота</string>
+
+  <!-- Min -->
+  <string name="min_elevation_label">Минимальная высота</string>
+  <string name="min_grade_label">Минимальный уклон</string>
+  <string name="min_pace_label">Минимальный темп</string>
+
+  <!-- Max -->
+  <string name="max_elevation_label">Максимальная высота</string>
+  <string name="max_grade_label">Максимальный уклон</string>
+  <string name="max_speed_label">Максимальная скорость</string>
+
+  <string name="loading_track">Загрузка трека...</string>
+
+  <!-- Chart Settings -->
+  <string name="chart_settings">Настройки диаграммы</string>
+  <!-- X Axis -->
+  <string name="x_axis">Ось X</string>
+  <string name="by_distance">По расстоянию</string>
+  <string name="by_time">По времени</string>
+
+  <!-- Y Axis -->
+  <string name="y_axis">Ось Y</string>
+
+  <!-- Units -->
+  <!-- Time  -->
+  <string name="hour">час</string>
+  <string name="hours">часов</string>
+  <string name="hr">ч</string>
+  <string name="min">мин</string>
+  <string name="minute">минута</string>
+  <string name="minutes">минут</string>
+  <string name="second">секунда</string>
+  <string name="seconds">секунд</string>
+  <string name="milliseconds">мс</string>
+
+  <!-- Distance -->
+  <string name="meter">м</string>
+  <string name="kilometer">км</string>
+  <string name="kilometers_long">километров</string>
+  <string name="feet">футов</string>
+  <string name="mile">миль</string>
+  <string name="miles_long">мили</string>
+
+  <!-- Speed and Pace -->
+  <string name="kilometer_per_hour">км/ч</string>
+  <string name="kilometer_per_hour_long">километров в час</string>
+  <string name="min_per_kilometer">мин/км</string>
+  <string name="per_kilometer">за километр</string>
+  <string name="mile_per_hour">миль/ч</string>
+  <string name="mile_per_hour_long">миль в час</string>
+  <string name="min_per_mile">мин/миля</string>
+  <string name="per_mile">за милю</string>
+
+  <!-- Sensors -->
+  <string name="watts">Вт</string>
+
+  <string name="revolutions_per_minute">об/мин</string>
+  <string name="bpm">bpm</string>
+
+  <!-- Stats Labels -->
+  <string name="moving_time_label">Время движения</string>
+  <string name="total_time_label">Общее время</string>
+  <string name="time_label">Время</string>
+  <string name="sd_unavail">SD карта недоступна</string>
+  <string name="speed">Скорость</string>
+  <string name="start_trip">Вы должны начать путешествие.</string>
+  <string name="statistics">Статистика</string>
+  <string name="total_distance_label">Общее расстояние</string>
+  <string name="distance_label">Расстояние</string>
+  <string name="power">Мощность</string>
+  <string name="cadence">Каденс</string>
+  <string name="heart_rate">Пульс</string>
+  <string name="max_heart_rate">Максимальный пульс</string>
+  <string name="unknown">-</string>
+  <string name="waiting">Ожидание...</string>
+
+  <!-- End User License Agreement -->
+  <string name="eula_title">Лицензионное соглашение</string>
+  <string name="accept">Принять</string>
+  <string name="decline">Отклонить</string>
+
+  <!-- About -->
+  <string name="about">О программе</string>
+  <string name="help">Справка</string>
+  <string name="about_team">Команда:</string>
+  <string name="about_version">Версия:</string>
+  <string name="about_support">Поддержка:</string>
+  <string name="about_privacy">Приватность:</string>
+
+  <!-- Send to Google -->
+  <string name="sendtogoogle_title">Отправить...</string>
+  <string name="sendtogoogle_google_fusiontables">Google Fusion Tables</string>
+  <string name="sendtogoogle_google_mymaps">Google \"Мои карты\"</string>
+  <string name="sendtogoogle_google_docs">Google Документы</string>
+  <string name="sendtogoogle_send_now">Отправить</string>
+  <string name="sendtogoogle_create_new_map">Создать новую карту</string>
+  <string name="sendtogoogle_pick_existing_map">Выбрать существующую карту</string>
+  <string name="sendtogoogle_send_stats">Отправить статистику трека</string>
+  <string name="sendtogoogle_send_stats_and_points">Отправить статистику и точки</string>
+
+  <!-- Getting the account to upload to. -->
+  <string name="no_account_found_title">Учетная запись не найдена</string>
+  <string name="no_account_found">Не найдена учетная запись для загрузки треков.</string>
+  <string name="choose_account_title">Выбор учетной записи</string>
+
+  <!-- SD card -->
+  <string name="io_no_external_storage_found">Не обнаружено внешнее устройство хранения данных. Убедитесь, что SD карта вставлена, и что ваш телефон не подключен к компьютеру.</string>
+  <string name="io_write_failed">Невозможно записать файл.</string>
+  <string name="io_read_failed">Невозможно прочитать из файла.</string>
+  <string name="io_create_dir_failed">Невозможно создать папку на SD карте.</string>
+  <string name="io_write_finished">Запись на SD карту закончена.</string>
+  <string name="io_read_finished">Чтение с SD карты закончено.</string>
+
+  <!-- VersionChecker -->
+  <string name="version_check_title">Проверить обновления</string>
+  <string name="version_check_upgrade_button">Обновить сейчас</string>
+  <string name="version_check_continue_button">Продолжить без обновления</string>
+  <string name="upgrade_required">Ваша версия %1$S больше не может работать должным образом, и больше не поддерживается. Обновите %1$s для продолжения использования.</string>
+  <string name="upgrade_recommended">Ваша версия %1$S больше не может работать должным образом. Вы можете обновить ее сейчас, либо продолжать использовать ее на свой страх и риск. Некоторые функции, такие как синхронизация с сервером может не функционировать до обновления.</string>
+  <string name="upgrade_available">Доступна новая версия %1$s. Вы можете продолжать использовать текущую версию без проблем, но вы не получите новейшие функции, до тех пор, пока не обновитесь.</string>
+
+  <!-- Welcome -->
+  <string name="welcome">Добро пожаловать</string>
+  <string name="welcome_read_later">Ок</string>
+  <string name="welcome_about">О My Tracks</string>
+
+  <!-- Announcement -->
+  <string name="announce_no_distance">My Tracks нет расстояния</string>
+  <!-- Format:
+  $1 : Distance label
+  $2 : Distance value (5)
+  $3 : Distance units (mi, km)
+  $4 : Time description (10 minutes 5 seconds)
+  $5 : Speed value (5.6) : Pace value (5 minutes 6 seconds)
+  $6 : Speed units (mph) : Pace units (per mile)
+  -->
+  <string name="announce_template">Мои треки %1$s %2$.2f %3$s в %4$s на %5$s %6$s</string>
+
+  <!-- Check Units -->
+  <string name="check_units_title">Единицы измерения обратите внимание</string>
+  <string name="check_units_message">По умолчанию используются метрические единицы. Вы хотели бы изменить этот параметр?</string>
+
+  <!-- Fake preference keys - never saved, but show options in the preferences screen -->
+  <string name="method_bluetooth">Bluetooth</string>
+  <string name="bluetooth_options">Параметры Bluetooth</string>
+  <string name="bluetooth_pairing">Подключение устройства</string>
+  <string name="bluetooth_pairing_summary">Открыть настройки Android по bluetooth для подключения устройства</string>
+  <string name="sensor_bluetooth_options_key">bluetoothSensorsEnabled</string>
+  <string name="ant_options">Параметры ANT</string>
+  <string name="sensor_options">Параметры датчика</string>
+
+  <!-- Bluetooth Sensor -->
+  <string name="bluetooth_connected">Подключен к %s</string>
+  <string name="bluetooth_connecting">Подключение Bluetooth датчика...</string>
+  <string name="bluetooth_not_connected">Bluetooth датчик не подключен</string>
+
+  <!-- Sensor State -->
+  <string name="sensor_data_time">Датчик времени</string>
+  <string name="power_meter_enabled">Измеритель мощности включен</string>
+  <string name="heart_rate_monitor_enabled">Монитор пульса включен</string>
+  <string name="no_sensor_manager">Нет диспетчера датчиков</string>
+  <string name="enabled">Включено</string>
+  <string name="connecting">Подключение</string>
+  <string name="connected">Подключено</string>
+  <string name="disconnected">Отключено</string>
+  <string name="no_sensor_service">Нет службы датчиков</string>
+  <string name="searching">Поиск</string>
+  <string name="sending">Отправка</string>
+
+  <!-- Manifest description (not seen inside the app) -->
+  <string name="notification_permission_label">получать уведомления о записи трека</string>
+  <string name="read_tracks_permission_label">чтение записанных данных трека</string>
+  <string name="write_tracks_permission_label">запись данных трека, старт/стоп записи треков</string>
+  <string name="notification_permission_description">Получать уведомления, при старте или останове записи трека.</string>
+  <string name="read_tracks_permission_description">Иметь возможность читать данные трека, такие как точки и путевые точки.</string>
+  <string name="write_tracks_permission_description">Иметь возможность записать данные трека, такие как начало записи или добавление путевых точек.</string>
+</resources>

MyTracks/res/values-sv/arrays.xml

@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Av</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-    <item>60 min</item>
-  </string-array>
-
   <!-- Minimum recording distance -->
   <string-array name="min_recording_distance_options">
     <item>1 m</item>
@@ -67,7 +55,6 @@ limitations under the License.
     <item>3.1 miles</item>
   </string-array>
 
-
   <!-- Minimum recording interval -->
   <string-array name="min_recording_interval_options">
     <item>batterioptimerad (anpassningsbar)</item>
@@ -113,9 +100,9 @@ limitations under the License.
     <item>3.1 miles (dålig GPS-signal)</item>
   </string-array>
 
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>Ingen delning</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Av</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -131,8 +118,8 @@ limitations under the License.
     <item>1 min</item>
   </string-array>
 
-  <string-array name="split_frequency_options_ft">
-    <item>Ingen delning</item>
+  <string-array name="task_frequency_options_ft">
+    <item>Av</item>
     <item>100 mi</item>
     <item>50 mi</item>
     <item>25 mi</item>

MyTracks/res/values-zh-rCN/arrays.xml

@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>关闭</item>
-    <item>1 分钟</item>
-    <item>2 分钟</item>
-    <item>5 分钟</item>
-    <item>10 分钟</item>
-    <item>15 分钟</item>
-    <item>30 分钟</item>
-    <item>60 分钟</item>
-  </string-array>
-
   <!-- Minimum recording distance -->
   <string-array name="min_recording_distance_options">
     <item>1 米</item>
@@ -112,9 +100,9 @@ limitations under the License.
     <item>3.1 英里 (糟糕的 GPS 信号)</item>
   </string-array>
 
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>不分割</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>关闭</item>
     <item>100 千米</item>
     <item>50 千米</item>
     <item>25 千米</item>
@@ -130,8 +118,8 @@ limitations under the License.
     <item>1 分钟</item>
   </string-array>
 
-  <string-array name="split_frequency_options_ft">
-    <item>不分割</item>
+  <string-array name="task_frequency_options_ft">
+    <item>关闭</item>
     <item>100 英里</item>
     <item>50 英里</item>
     <item>25 英里</item>
@@ -155,6 +143,7 @@ limitations under the License.
     <item>15 分钟</item>
     <item>总是</item>
   </string-array>
+
   <!-- Other non-preference arrays -->
   <array name="activity_types">
     <item>未知</item>

MyTracks/res/values-zh-rCN/strings.xml

@@ -219,7 +219,6 @@ limitations under the License.
   <string name="settings_backup_to_sd_summary">将你所有轨迹和设置的完整备份写入到 SD 存储卡</string>
   <string name="settings_restore_from_sd">立即恢复</string>
   <string name="settings_restore_from_sd_summary">从 SD 存储卡恢复所有轨迹和设置</string>
-  <string name="settings_no_backup_while_recording">在记录轨迹时无法处理备份数据.</string>
 
   <!-- Backups -->
   <string name="restore_overwrites_warning">从 SD 存储卡恢复备份数据将覆盖掉你当前的所有轨迹和设置. 确定要继续吗?</string>

MyTracks/res/values/arrays.xml

@@ -15,31 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <!-- Task frequency -->
-  <string-array name="task_frequency_options">
-    <item>Off</item>
-    <item>1 min</item>
-    <item>2 min</item>
-    <item>5 min</item>
-    <item>10 min</item>
-    <item>15 min</item>
-    <item>30 min</item>
-    <item>60 min</item>
-  </string-array>
-
-  <!-- DO NOT TRANSLATE -->
-  <string-array name="task_frequency_values">
-    <item>-1</item>
-    <item>1</item>
-    <item>2</item>
-    <item>5</item>
-    <item>10</item>
-    <item>15</item>
-    <item>30</item>
-    <item>60</item>
-  </string-array>
-
-
   <!-- Minimum recording distance -->
   <string-array name="min_recording_distance_options">
     <item>1 m</item>
@@ -61,18 +36,6 @@ limitations under the License.
     <item>328 ft</item>
   </string-array>
 
-  <!-- DO NOT TRANSLATE -->
-  <string-array name="min_recording_distance_values">
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-    <item>5</item>
-    <item>10</item>
-    <item>100</item>
-  </string-array>
-
-
   <!-- Maximum recording distance -->
   <string-array name="max_recording_distance_options">
     <item>50 m</item>
@@ -92,17 +55,6 @@ limitations under the License.
     <item>3.1 miles</item>
   </string-array>
 
-  <!-- DO NOT TRANSLATE -->
-  <string-array name="max_recording_distance_values">
-    <item>50</item>
-    <item>100</item>
-    <item>200</item>
-    <item>500</item>
-    <item>1000</item>
-    <item>5000</item>
-  </string-array>
-
-
   <!-- Minimum recording interval -->
   <string-array name="min_recording_interval_options">
     <item>battery miser (adaptive)</item>
@@ -123,27 +75,6 @@ limitations under the License.
     <item>30 min</item>
   </string-array>
 
-  <!-- DO NOT TRANSLATE -->
-  <string-array name="min_recording_interval_values">
-    <item>-2</item>
-    <item>-1</item>
-    <item>0</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-    <item>5</item>
-    <item>10</item>
-    <item>20</item>
-    <item>30</item>
-    <item>60</item>
-    <item>120</item>
-    <item>300</item>
-    <item>480</item>
-    <item>900</item>
-    <item>1800</item>
-  </string-array>
-
-
   <!-- Minimum required accuracy -->
   <string-array name="min_required_accuracy_options">
     <item>10 m (excellent GPS signal)</item>
@@ -169,23 +100,9 @@ limitations under the License.
     <item>3.1 miles (poor GPS signal)</item>
   </string-array>
 
-  <!-- DO NOT TRANSLATE -->
-  <string-array name="min_required_accuracy_values">
-    <item>10</item>
-    <item>20</item>
-    <item>50</item>
-    <item>100</item>
-    <item>200</item>
-    <item>500</item>
-    <item>1000</item>
-    <item>2000</item>
-    <item>5000</item>
-  </string-array>
-
-
-  <!-- Split frequency -->
-  <string-array name="split_frequency_options">
-    <item>No splitting</item>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Off</item>
     <item>100 km</item>
     <item>50 km</item>
     <item>25 km</item>
@@ -201,8 +118,8 @@ limitations under the License.
     <item>1 min</item>
   </string-array>
 
-  <string-array name="split_frequency_options_ft">
-    <item>No splitting</item>
+  <string-array name="task_frequency_options_ft">
+    <item>Off</item>
     <item>100 mi</item>
     <item>50 mi</item>
     <item>25 mi</item>
@@ -218,24 +135,6 @@ limitations under the License.
     <item>1 min</item>
   </string-array>
 
-  <!-- DO NOT TRANSLATE -->
-  <string-array name="split_frequency_values">
-    <item>0</item>
-    <item>-100</item>
-    <item>-50</item>
-    <item>-25</item>
-    <item>-10</item>
-    <item>-5</item>
-    <item>-1</item>
-    <item>60</item>
-    <item>30</item>
-    <item>15</item>
-    <item>10</item>
-    <item>5</item>
-    <item>2</item>
-    <item>1</item>
-  </string-array>
-
   <!-- Auto-resume track timeout -->
   <string-array name="auto_resume_track_timeout_options">
     <item>Never</item>
@@ -245,16 +144,6 @@ limitations under the License.
     <item>Always</item>
   </string-array>
 
-  <!-- DO NOT TRANSLATE -->
-  <string-array name="auto_resume_track_timeout_values">
-    <item>0</item>
-    <item>5</item>
-    <item>10</item>
-    <item>15</item>
-    <item>-1</item>
-  </string-array>
-
-
   <!-- Other non-preference arrays -->
   <array name="activity_types">
     <item>unknown</item>
@@ -383,14 +272,6 @@ limitations under the License.
     <item>way point</item>
   </array>
 
-  <!-- DO NOT TRANSLATE -->
-  <array name="export_formats">
-    <item>GPX</item>
-    <item>KML</item>
-    <item>CSV</item>
-    <item>TCX</item>
-  </array>
-
   <array name="sensor_type_options">
     <item>None</item>
     <item>ANT+ Sensors</item>
@@ -398,18 +279,4 @@ limitations under the License.
     <item>Zephyr Bluetooth</item>
   </array>
 
-  <!-- DO NOT TRANSLATE -->
-  <array name="sensor_type_values">
-    <item>@string/none</item>
-    <item>@string/ant_sensor_type</item>
-    <item>@string/srm_ant_bridge_sensor_type</item>
-    <item>@string/zephyr_sensor_type</item>
-  </array>
-
-  <!-- DO NOT TRANSLATE -->
-  <string-array name="ant_sensor_type_values">
-  	<item>@string/ant_sensor_type</item>
-  	<item>@string/srm_ant_bridge_sensor_type</item>
-  </string-array>
-
 </resources>

MyTracks/res/values/arrays_do_not_translate.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+<resources>
+  <!-- Do not translate any arrays in this file. -->
+  <string-array name="min_required_accuracy_values">
+    <item>10</item>
+    <item>20</item>
+    <item>50</item>
+    <item>100</item>
+    <item>200</item>
+    <item>500</item>
+    <item>1000</item>
+    <item>2000</item>
+    <item>5000</item>
+  </string-array>
+ 
+  <string-array name="min_recording_distance_values">
+    <item>1</item>
+    <item>2</item>
+    <item>3</item>
+    <item>4</item>
+    <item>5</item>
+    <item>10</item>
+    <item>100</item>
+  </string-array>
+
+  <string-array name="min_recording_distance_values">
+    <item>1</item>
+    <item>2</item>
+    <item>3</item>
+    <item>4</item>
+    <item>5</item>
+    <item>10</item>
+    <item>100</item>
+  </string-array>
+
+  <string-array name="max_recording_distance_values">
+    <item>50</item>
+    <item>100</item>
+    <item>200</item>
+    <item>500</item>
+    <item>1000</item>
+    <item>5000</item>
+  </string-array>
+
+  <string-array name="min_recording_interval_values">
+    <item>-2</item>
+    <item>-1</item>
+    <item>0</item>
+    <item>2</item>
+    <item>3</item>
+    <item>4</item>
+    <item>5</item>
+    <item>10</item>
+    <item>20</item>
+    <item>30</item>
+    <item>60</item>
+    <item>120</item>
+    <item>300</item>
+    <item>480</item>
+    <item>900</item>
+    <item>1800</item>
+  </string-array>
+
+  <string-array name="task_frequency_values">
+    <item>0</item>
+    <item>-100</item>
+    <item>-50</item>
+    <item>-25</item>
+    <item>-10</item>
+    <item>-5</item>
+    <item>-1</item>
+    <item>60</item>
+    <item>30</item>
+    <item>15</item>
+    <item>10</item>
+    <item>5</item>
+    <item>2</item>
+    <item>1</item>
+  </string-array>
+
+  <string-array name="auto_resume_track_timeout_values">
+    <item>0</item>
+    <item>5</item>
+    <item>10</item>
+    <item>15</item>
+    <item>-1</item>
+  </string-array>
+
+  <array name="export_formats">
+    <item>GPX</item>
+    <item>KML</item>
+    <item>CSV</item>
+    <item>TCX</item>
+  </array>
+
+  <array name="sensor_type_values">
+    <item>@string/none</item>
+    <item>@string/ant_sensor_type</item>
+    <item>@string/srm_ant_bridge_sensor_type</item>
+    <item>@string/zephyr_sensor_type</item>
+  </array>
+
+  <string-array name="ant_sensor_type_values">
+    <item>@string/ant_sensor_type</item>
+    <item>@string/srm_ant_bridge_sensor_type</item>
+  </string-array>
+</resources>

MyTracks/res/values/do_not_translate.xml

@@ -23,7 +23,7 @@ limitations under the License.
   <string name="about_weburl">mytracks.appspot.com</string>
   <string name="about_privacy_weburl">m.google.com/privacy</string>
   <string name="about_copyright_message">Copyright 2009 Google Inc.</string>
-  <string name="about_bart">Bartlomiej Niechwiej</string>
+  <string name="about_bart">Bartłomiej Niechwiej</string>
   <string name="about_dylan">Dylan Casey</string>
   <string name="about_leif">Leif Hendrik Wilden</string>
   <string name="about_rdamazio">Rodrigo Damazio Bovendorp</string>

MyTracks/res/values/keys.xml

@@ -50,8 +50,7 @@ limitations under the License.
   <!-- Keys for non-persisted preferences - DO NOT TRANSLATE -->
   <string name="backup_to_sd_key">backupToSd</string>
   <string name="restore_from_sd_key">restoreFromSd</string>
-
-  <!-- Inoperative keys used for the location of preferences items -->
+  <string name="reset_key">resetToDefaults</string>
   <string name="sensor_options_key">sensorOptions</string>
   <string name="ant_options_key">antOptions</string>
 </resources>

MyTracks/res/values/strings.xml

@@ -45,6 +45,7 @@ limitations under the License.
   <string name="error_invalid_gpx_format">File does not have a valid GPX format.</string>
   <string name="error_generic">An error occurred. Please try again.</string>
   <string name="error_track_does_not_exist">Track does not exist.</string>
+  <string name="error_operation_cancelled">The operation was cancelled.</string>
   <string name="error_out_of_memory">This file is too big (must be less than 500 KB). Aborting.</string>
   <string name="error_unable_to_insert_marker">Unable to insert marker. No location fix available.</string>
 
@@ -157,7 +158,6 @@ limitations under the License.
   <string name="tracklist_clear_map">Clear map</string>
   <!-- Import All -->
   <string name="tracklist_btn_import_all">Import all</string>
-  <string name="import_done">Import finished, imported</string>
   <!-- Format:
   $1 : Successful imports
   $2 : Attempted imports
@@ -196,6 +196,7 @@ limitations under the License.
   <string name="settings_sharing">Sharing</string>
 
   <string name="settings_not_available_summary">Not available in your version of Android</string>
+  <string name="settings_not_while_recording">Not available while recording a track</string>
 
   <string name="settings_announcement_frequency">Announcement frequency</string>
   <string name="settings_announcement_frequency_summary">Minimum time between two voice announcements</string>
@@ -238,6 +239,11 @@ limitations under the License.
   <string name="settings_timestamp_track_name_summary_on">The default track name will be the date and time at the start of the track</string>
   <string name="settings_timestamp_track_name_summary_off">Track names will have numbers which increment for each new track.</string>
 
+  <string name="settings_reset">Reset to defaults</string>
+  <string name="settings_reset_summary">Revert all your settings to the default values</string>
+  <string name="settings_reset_dialog_message">All your settings will be erased and reverted to the default values. Saved tracks will be preserved. Are you sure?</string>
+  <string name="settings_reset_done">All settings have been reverted to their defaults.</string>
+
   <string name="pace_label">Pace</string>
 
   <string name="eclair_required">Only supported in Android 2.0 or above</string>
@@ -259,7 +265,6 @@ limitations under the License.
   <string name="settings_backup_to_sd_summary">Write a full copy of all your tracks and settings to the SD card</string>
   <string name="settings_restore_from_sd">Restore now</string>
   <string name="settings_restore_from_sd_summary">Restore all tracks and settings from the SD card</string>
-  <string name="settings_no_backup_while_recording">Cannot manipulate backups while recording a track.</string>
 
   <string name="restore_overwrites_warning">Restoring a backup from the SD card will OVERWRITE all your current tracks and settings. Are you sure?</string>
   <string name="select_backup_to_restore">Select the backup to restore</string>

MyTracks/res/xml/preferences.xml

@@ -48,8 +48,8 @@ limitations under the License.
         android:key="@string/split_frequency_key"
         android:title="@string/settings_split_frequency"
         android:summary="@string/settings_split_frequency_summary"
-        android:entries="@array/split_frequency_options"
-        android:entryValues="@array/split_frequency_values"
+        android:entries="@array/task_frequency_options"
+        android:entryValues="@array/task_frequency_values"
         android:defaultValue="0" />
 
     <com.google.android.apps.mytracks.IntegerListPreference
@@ -173,4 +173,11 @@ limitations under the License.
           android:persistent="false" />
     </PreferenceCategory>
   </PreferenceScreen>
+
+  <!-- Reset to defaults -->
+  <Preference
+      android:title="@string/settings_reset"
+      android:key="@string/reset_key"
+      android:summary="@string/settings_reset_summary"
+      android:persistent="false" />
 </PreferenceScreen>

MyTracks/src/com/dsi/ant/AntInterface.java

@@ -15,22 +15,20 @@
  */
 package com.dsi.ant;
 
-import java.util.Arrays;
+import com.dsi.ant.exception.AntInterfaceException;
+import com.dsi.ant.exception.AntRemoteException;
+import com.dsi.ant.exception.AntServiceNotConnectedException;
 
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
 
-import com.dsi.ant.exception.*;
+import java.util.Arrays;
 
 /**
  * Public API for controlling the Ant Service. AntInterface is a proxy

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

@@ -59,7 +59,7 @@ public class AccountChooser {
   public void chooseAccount(final Activity activity,
       final AccountHandler handler) {
     final Account[] accounts = AccountManager.get(activity)
-        .getAccountsByType(MyTracksConstants.ACCOUNT_TYPE);
+        .getAccountsByType(Constants.ACCOUNT_TYPE);
     if (accounts.length < 1) {
       alertNoAccounts(activity, handler);
       return;
@@ -76,7 +76,7 @@ public class AccountChooser {
     }
     
     // Let the user choose.
-    Log.e(MyTracksConstants.TAG, "Multiple matching accounts found.");
+    Log.e(Constants.TAG, "Multiple matching accounts found.");
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
     builder.setTitle(R.string.choose_account_title);
     builder.setCancelable(false);
@@ -112,7 +112,7 @@ public class AccountChooser {
    */
   private void alertNoAccounts(final Activity activity,
       final AccountHandler handler) {
-    Log.e(MyTracksConstants.TAG, "No matching accounts found.");
+    Log.e(Constants.TAG, "No matching accounts found.");
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
     builder.setTitle(R.string.no_account_found_title);
     builder.setMessage(R.string.no_account_found);

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

@@ -40,7 +40,7 @@ public class AggregatedStatsActivity extends Activity implements
   @Override
   public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
           String key) {
-    Log.d(MyTracksConstants.TAG, "StatsActivity: onSharedPreferences changed "
+    Log.d(Constants.TAG, "StatsActivity: onSharedPreferences changed "
             + key);
     if (key != null) {
       if (key.equals(R.string.metric_units_key)) {
@@ -67,7 +67,7 @@ public class AggregatedStatsActivity extends Activity implements
     sv.setScrollBarStyle(ScrollView.SCROLLBARS_OUTSIDE_INSET);
 
     SharedPreferences preferences = getSharedPreferences(
-            MyTracksSettings.SETTINGS_NAME, 0);
+            Constants.SETTINGS_NAME, 0);
     if (preferences != null) {
       metricUnits = preferences.getBoolean(getString(R.string.metric_units_key), true);
       preferences.registerOnSharedPreferenceChangeListener(this);

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

@@ -16,8 +16,8 @@
 package com.google.android.apps.mytracks;
 
 import static android.content.Intent.ACTION_BOOT_COMPLETED;
-import static com.google.android.apps.mytracks.MyTracksConstants.RESUME_TRACK_EXTRA_NAME;
-import static com.google.android.apps.mytracks.MyTracksConstants.TAG;
+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.TrackRecordingService;
 
@@ -41,17 +41,17 @@ import android.util.Log;
  * 
  * @author Bartlomiej Niechwiej
  */
-public class MyTracksReceiver extends BroadcastReceiver {
+public class BootReceiver extends BroadcastReceiver {
 
   @Override
   public void onReceive(Context context, Intent intent) {
-    Log.d(TAG, "MyTracksReceiver.onReceive: " + intent.getAction());
+    Log.d(TAG, "BootReceiver.onReceive: " + intent.getAction());
     if (ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
       Intent startIntent = new Intent(context, TrackRecordingService.class);
       startIntent.putExtra(RESUME_TRACK_EXTRA_NAME, true);
       context.startService(startIntent);
     } else {
-      Log.w(TAG, "MyTracksReceiver: unsupported action");
+      Log.w(TAG, "BootReceiver: unsupported action");
     }
   }
 }

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

@@ -15,31 +15,28 @@
  */
 package com.google.android.apps.mytracks;
 
+import static com.google.android.apps.mytracks.Constants.TAG;
+
 import com.google.android.apps.mytracks.ChartView.Mode;
 import com.google.android.apps.mytracks.content.MyTracksLocation;
-import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Sensor;
-import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.TrackPointsColumns;
-import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.WaypointsColumns;
+import com.google.android.apps.mytracks.content.TrackDataHub;
+import com.google.android.apps.mytracks.content.TrackDataListener;
 import com.google.android.apps.mytracks.content.Sensor.SensorDataSet;
-import com.google.android.apps.mytracks.services.StatusAnnouncerFactory;
+import com.google.android.apps.mytracks.content.TrackDataHub.ListenerDataType;
+import com.google.android.apps.mytracks.content.Track;
+import com.google.android.apps.mytracks.content.Waypoint;
+import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerFactory;
 import com.google.android.apps.mytracks.stats.DoubleBuffer;
 import com.google.android.apps.mytracks.stats.TripStatisticsBuilder;
 import com.google.android.apps.mytracks.util.ApiFeatures;
-import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
-import android.content.SharedPreferences;
-import android.database.ContentObserver;
-import android.database.Cursor;
 import android.location.Location;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -51,53 +48,34 @@ import android.widget.LinearLayout;
 import android.widget.ZoomControls;
 
 import java.util.ArrayList;
+import java.util.EnumSet;
 
 /**
  * An activity that displays a chart from the track point provider.
  *
  * @author Sandor Dornbush
+ * @author Rodrigo Damazio
  */
-public class ChartActivity extends Activity implements
-    SharedPreferences.OnSharedPreferenceChangeListener {
-
-  private final static int BUFFER_SIZE = 1024;
-  private double profileLength = 0;
-
-  private boolean metricUnits = true;
-  private boolean reportSpeed = true;
-
-  /**
-   * The track id that is displayed.
-   */
-  private long selectedTrackId = -1;
-
-  /**
-   * Id of the last location that was seen when reading tracks from the
-   * provider. This is used to determine which locations are new compared to the
-   * last time the chart was updated.
-   */
-  private long lastSeenLocationId = -1;
-
-  private long startTime = -1;
-
-  private Location lastLocation;
-
-  /**
-   * The id of the track currently being recorded.
-   */
-  private long recordingTrackId = -1;
+public class ChartActivity extends Activity implements TrackDataListener {
 
   private final DoubleBuffer elevationBuffer =
-      new DoubleBuffer(MyTracksConstants.ELEVATION_SMOOTHING_FACTOR);
+      new DoubleBuffer(Constants.ELEVATION_SMOOTHING_FACTOR);
   private final DoubleBuffer speedBuffer =
-      new DoubleBuffer(MyTracksConstants.SPEED_SMOOTHING_FACTOR);
+      new DoubleBuffer(Constants.SPEED_SMOOTHING_FACTOR);
+  private final ArrayList<double[]> pendingPoints = new ArrayList<double[]>();
 
+  private TrackDataHub dataHub;
+
+  // Stats gathered from received data.
+  private double profileLength = 0;
+  private long startTime = -1;
+  private Location lastLocation;
+  private double trackMaxSpeed;
+
+  // Modes of operation
   private Mode mode = Mode.BY_DISTANCE;
-
-  /**
-   * Utilities to deal with the database.
-   */
-  private MyTracksProviderUtils providerUtils;
+  private boolean metricUnits;
+  private boolean reportSpeed;
 
   /*
    * UI elements:
@@ -107,9 +85,6 @@ public class ChartActivity extends Activity implements
   private LinearLayout busyPane;
   private ZoomControls zoomControls;
 
-  /** Handler for callbacks to the UI thread */
-  private final Handler uiHandler = new Handler();
-
   /**
    * A runnable that can be posted to the UI thread. It will remove the spinner
    * (if any), enable/disable zoom controls and orange pointer as appropriate
@@ -121,89 +96,17 @@ public class ChartActivity extends Activity implements
       busyPane.setVisibility(View.GONE);
       zoomControls.setIsZoomInEnabled(chartView.canZoomIn());
       zoomControls.setIsZoomOutEnabled(chartView.canZoomOut());
-      chartView.setShowPointer(selectedTrackIsRecording());
+      chartView.setShowPointer(dataHub.isRecordingSelected());
       chartView.invalidate();
     }
   };
 
-  /**
-   * A runnable that can be posted to the UI thread. It will show the spinner.
-   */
-  private final Runnable showSpinner = new Runnable() {
-    @Override
-    public void run() {
-      busyPane.setVisibility(View.VISIBLE);
-    }
-  };
-
-  /**
-   * An observer for the tracks provider. Will listen to new track points being
-   * added and update the chart if necessary.
-   */
-  private ContentObserver observer;
-
-  /**
-   * An observer for the waypoints provider. Will listen to new way points being
-   * added and update the chart if necessary.
-   */
-  private ContentObserver waypointObserver;
-
-  /**
-   * A thread with a looper. Post to updateTrackHandler to execute Runnables on
-   * this thread.
-   */
-  private final HandlerThread updateTrackThread =
-      new HandlerThread("updateTrackThread");
-
-  /** Handler for updateTrackThread */
-  private Handler updateTrackHandler;
-
-  /**
-   * A runnable that updates the profile from the provider.
-   */
-  private final Runnable updateTrackRunnable = new Runnable() {
-    @Override
-    public void run() {
-      readNewTrackPoints();
-    }
-  };
-
-  @Override
-  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
-      String key) {
-    if (key != null) {
-      if (key.equals(getString(R.string.selected_track_key))) {
-        selectedTrackId =
-            sharedPreferences.getLong(getString(R.string.selected_track_key),
-                -1);
-        readProfileAsync();
-      } else if (key.equals(getString(R.string.metric_units_key))) {
-        metricUnits =
-            sharedPreferences.getBoolean(getString(R.string.metric_units_key),
-                true);
-        chartView.setMetricUnits(metricUnits);
-        readProfileAsync();
-      } else if (key.equals(getString(R.string.report_speed_key))) {
-        reportSpeed =
-            sharedPreferences.getBoolean(getString(R.string.report_speed_key),
-                true);
-        chartView.setReportSpeed(reportSpeed, this);
-        readProfileAsync();
-      } else if (key.equals(getString(R.string.recording_track_key))) {
-        recordingTrackId =
-            sharedPreferences.getLong(getString(R.string.recording_track_key),
-                -1);
-        runOnUiThread(updateChart);
-      }
-    }
-  }
-
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    Log.w(MyTracksConstants.TAG, "ChartActivity.onCreate");
+    Log.w(TAG, "ChartActivity.onCreate");
     super.onCreate(savedInstanceState);
     MyTracks.getInstance().setChartActivity(this);
-    providerUtils = MyTracksProviderUtils.Factory.get(this);
+    dataHub = MyTracks.getInstance().getDataHub();
 
     // The volume we want to control is the Text-To-Speech volume
     int volumeStream =
@@ -219,22 +122,6 @@ public class ChartActivity extends Activity implements
         new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
     layout.addView(chartView, params);
 
-    SharedPreferences preferences =
-        getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
-    if (preferences != null) {
-      selectedTrackId =
-          preferences.getLong(getString(R.string.selected_track_key), -1);
-      recordingTrackId =
-          preferences.getLong(getString(R.string.recording_track_key), -1);
-      metricUnits = preferences.getBoolean(getString(R.string.metric_units_key),
-          true);
-      chartView.setMetricUnits(metricUnits);
-      reportSpeed = preferences.getBoolean(getString(R.string.report_speed_key),
-          true);
-      chartView.setReportSpeed(reportSpeed, this);
-      preferences.registerOnSharedPreferenceChangeListener(this);
-    }
-
     busyPane = (LinearLayout) findViewById(R.id.elevation_busypane);
     zoomControls = (ZoomControls) findViewById(R.id.elevation_zoom);
     zoomControls.setOnZoomInClickListener(new View.OnClickListener() {
@@ -249,97 +136,25 @@ public class ChartActivity extends Activity implements
         zoomOut();
       }
     });
-
-    updateTrackThread.start();
-    updateTrackHandler = new Handler(updateTrackThread.getLooper());
-
-    // Register observer for the track point provider:
-    Handler contentHandler = new Handler();
-    observer = new ContentObserver(contentHandler) {
-      @Override
-      public void onChange(boolean selfChange) {
-        Log.d(MyTracksConstants.TAG, "ChartActivity: ContentObserver.onChange");
-        // Check for any new locations and append them to the currently
-        // recording track.
-        if (recordingTrackId < 0) {
-          // No track is being recorded. We should not be here.
-          return;
-        }
-        if (selectedTrackId != recordingTrackId) {
-          // No track, or one other than the recording track is selected, don't
-          // bother.
-          return;
-        }
-        // Update can potentially be lengthy, put it in its own thread:
-        updateTrackHandler.post(updateTrackRunnable);
-        super.onChange(selfChange);
-      }
-    };
-
-    waypointObserver = new ContentObserver(contentHandler) {
-      @Override
-      public void onChange(boolean selfChange) {
-        Log.d(MyTracksConstants.TAG,
-            "MyTracksMap: ContentObserver.onChange waypoints");
-        if (selectedTrackId < 0) {
-          return;
-        }
-        Thread t = new Thread() {
-          @Override
-          public void run() {
-            readWaypoints();
-            ChartActivity.this.runOnUiThread(new Runnable() {
-              @Override
-              public void run() {
-                chartView.invalidate();
-              }
-            });
-          }
-        };
-        t.start();
-        super.onChange(selfChange);
-      }
-    };
-
-    readProfileAsync();
-  }
-
-  @Override
-  protected void onPause() {
-    super.onPause();
-    unregisterContentObservers();
   }
 
   @Override
   protected void onResume() {
     super.onResume();
-    // Make sure any updates that might have happened are propagated to this
-    // activity:
-    observer.onChange(false);
-    waypointObserver.onChange(false);
-    registerContentObservers();
+
+    dataHub.registerTrackDataListener(this, EnumSet.of(
+        ListenerDataType.SELECTED_TRACK_CHANGED,
+        ListenerDataType.POINT_UPDATES,
+        ListenerDataType.SAMPLED_OUT_POINT_UPDATES,
+        ListenerDataType.WAYPOINT_UPDATES,
+        ListenerDataType.DISPLAY_PREFERENCES));
   }
 
-  /**
-   * Register the content observer for the map overlay.
-   */
-  private void registerContentObservers() {
-    getContentResolver().registerContentObserver(TrackPointsColumns.CONTENT_URI,
-        false/* notifyForDescendents */, observer);
-    getContentResolver().registerContentObserver(WaypointsColumns.CONTENT_URI,
-        false/* notifyForDescendents */, waypointObserver);
-  }
+  @Override
+  protected void onPause() {
+    dataHub.unregisterTrackDataListener(this);
 
-  /**
-   * Unregister the content observer for the map overlay.
-   */
-  private void unregisterContentObservers() {
-    getContentResolver().unregisterContentObserver(observer);
-    getContentResolver().unregisterContentObserver(waypointObserver);
-  }
-
-  private boolean selectedTrackIsRecording() {
-    return selectedTrackId == recordingTrackId;
+    super.onPause();
   }
 
   private void zoomIn() {
@@ -358,7 +173,7 @@ public class ChartActivity extends Activity implements
     if (this.mode != newMode) {
       this.mode = newMode;
       chartView.setMode(this.mode);
-      readProfileAsync();
+      dataHub.reloadDataForListener(this);
     }
   }
 
@@ -375,39 +190,11 @@ public class ChartActivity extends Activity implements
     return chartView.getChartValueSeries(index).isEnabled();
   }
 
-  private void readWaypoints() {
-    if (selectedTrackId < 0) {
-      return;
-    }
-    Cursor cursor = null;
-    chartView.clearWaypoints();
-    try {
-      // We will silently drop extra waypoints to make the app responsive.
-      cursor =
-          providerUtils.getWaypointsCursor(selectedTrackId, 0,
-              MyTracksConstants.MAX_DISPLAYED_TRACK_POINTS);
-      if (cursor != null) {
-        if (cursor.moveToFirst()) {
-          do {
-            Waypoint wpt = providerUtils.createWaypoint(cursor);
-            chartView.addWaypoint(wpt);
-          } while (cursor.moveToNext());
-        }
-      }
-    } catch (RuntimeException e) {
-      Log.w(MyTracksConstants.TAG, "Caught an unexpected exception.", e);
-    } finally {
-      if (cursor != null) {
-        cursor.close();
-      }
-    }
-  }
-
   @Override
   public boolean onCreateOptionsMenu(Menu menu) {
     super.onCreateOptionsMenu(menu);
     chartSettingsMenuItem =
-        menu.add(0, MyTracksConstants.MENU_CHART_SETTINGS, 0,
+        menu.add(0, Constants.MENU_CHART_SETTINGS, 0,
             R.string.chart_settings);
     chartSettingsMenuItem.setIcon(R.drawable.chart_settings);
     return true;
@@ -416,7 +203,7 @@ public class ChartActivity extends Activity implements
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
-      case MyTracksConstants.MENU_CHART_SETTINGS:
+      case Constants.MENU_CHART_SETTINGS:
         MyTracks.getInstance().getDialogManager().showDialogSafely(
             DialogManager.DIALOG_CHART_SETTINGS);
         return true;
@@ -438,49 +225,47 @@ public class ChartActivity extends Activity implements
    * This must be called in order for each point.
    *
    * @param location the location to get data for (this method takes ownership of that location)
-   * @param track the track to get data from
    * @param result the resulting point to fill out
    * @return the previous location, now available for reuse
    */
-  private Location getDataPoint(Location location, Track track, double[] result) {
+  private void fillDataPoint(Location location, double result[]) {
+    double timeOrDistance = Double.NaN,
+           elevation = Double.NaN,
+           speed = Double.NaN,
+           power = Double.NaN,
+           cadence = Double.NaN,
+           heartRate = Double.NaN;
+
     if (location instanceof MyTracksLocation &&
         ((MyTracksLocation) location).getSensorDataSet() != null) {
       SensorDataSet sensorData = ((MyTracksLocation) location).getSensorDataSet();
       if (sensorData.hasPower()
           && sensorData.getPower().getState() == Sensor.SensorState.SENDING
           && sensorData.getPower().hasValue()) {
-        result[3] = sensorData.getPower().getValue();
-      } else {
-        result[3] = Double.NaN;
+        power = sensorData.getPower().getValue();
       }
       if (sensorData.hasCadence()
           && sensorData.getCadence().getState() == Sensor.SensorState.SENDING
           && sensorData.getCadence().hasValue()) {
-        result[4] = sensorData.getCadence().getValue();
-      } else {
-        result[4] = Double.NaN;
+        cadence = sensorData.getCadence().getValue();
       }
       if (sensorData.hasHeartRate()
           && sensorData.getHeartRate().getState() == Sensor.SensorState.SENDING
           && sensorData.getHeartRate().hasValue()) {
-        result[5] = sensorData.getHeartRate().getValue();
-      } else {
-        result[5] = Double.NaN;
+        heartRate = sensorData.getHeartRate().getValue();
       }
-    } else {
-      result[3] = Double.NaN;
-      result[4] = Double.NaN;
-      result[5] = Double.NaN;
     }
+
+    // TODO: Account for segment splits?
     switch (mode) {
       case BY_DISTANCE:
-        result[0] = profileLength;
+        timeOrDistance = profileLength / 1000.0;
         if (lastLocation != null) {
           double d = lastLocation.distanceTo(location);
           if (metricUnits) {
-            profileLength += d / 1000.0;
+            profileLength += d;
           } else {
-            profileLength += d * UnitConversions.KM_TO_MI / 1000.0;
+            profileLength += d * UnitConversions.KM_TO_MI;
           }
         }
         break;
@@ -489,16 +274,16 @@ public class ChartActivity extends Activity implements
           // Base case
           startTime = location.getTime();
         }
-        result[0] = (location.getTime() - startTime);
+        timeOrDistance = (location.getTime() - startTime);
         break;
       default:
-        Log.w(MyTracksConstants.TAG, "ChartActivity unknown mode: " + mode);
+        Log.w(TAG, "ChartActivity unknown mode: " + mode);
     }
 
     elevationBuffer.setNext(metricUnits
         ? location.getAltitude()
         : location.getAltitude() * UnitConversions.M_TO_FT);
-    result[1] = elevationBuffer.getAverage();
+    elevation = elevationBuffer.getAverage();
 
     if (lastLocation == null) {
       if (Math.abs(location.getSpeed() - 128) > 1) {
@@ -507,151 +292,151 @@ public class ChartActivity extends Activity implements
     } else if (TripStatisticsBuilder.isValidSpeed(
         location.getTime(), location.getSpeed(), lastLocation.getTime(),
         lastLocation.getSpeed(), speedBuffer)
-        && (location.getSpeed() <= track.getStatistics().getMaxSpeed())) {
+        && (location.getSpeed() <= trackMaxSpeed)) {
       speedBuffer.setNext(location.getSpeed());
     }
-    result[2] = speedBuffer.getAverage() * 3.6;
+    speed = speedBuffer.getAverage() * 3.6;
     if (!metricUnits) {
-      result[2] *= UnitConversions.KM_TO_MI;
+      speed *= UnitConversions.KM_TO_MI;
     }
-    if (!reportSpeed && (result[2] != 0)) {
-      // Format as hours per unit
-      result[2] = (60.0 / result[2]);
+    if (!reportSpeed) {
+      if (speed != 0) {
+        // Format as hours per unit
+        speed = (60.0 / speed);
+      } else {
+        speed = Double.NaN;
+      }
     }
 
-    Location oldLastLocation = lastLocation;
+    // Keep a copy so the location can be reused.
     lastLocation = location;
 
-    if (oldLastLocation == null) {
-      // No previous location, but return a blank one for reuse
-      return new MyTracksLocation("");
+    if (result != null) {
+      result[0] = timeOrDistance;
+      result[1] = elevation;
+      result[2] = speed;
+      result[3] = power;
+      result[4] = cadence;
+      result[5] = heartRate;
     }
-
-    return oldLastLocation;
   }
 
-  /**
-   * Sets the chart data points reading from the provider. This is non-blocking.
-   */
-  private void readProfileAsync() {
-    chartView.reset();
-    updateTrackHandler.post(new Runnable() {
+  @Override
+  public void onProviderStateChange(ProviderState state) {
+    // We don't care.
+  }
+
+  @Override
+  public void onCurrentLocationChanged(Location loc) {
+    // We don't care.
+  }
+
+  @Override
+  public void onCurrentHeadingChanged(double heading) {
+    // We don't care.
+  }
+
+  @Override
+  public void onSelectedTrackChanged(Track track, boolean isRecording) {
+    runOnUiThread(new Runnable() {
+      @Override
       public void run() {
-        runOnUiThread(showSpinner);
-        readProfile();
-        readWaypoints();
-        runOnUiThread(updateChart);
+        busyPane.setVisibility(View.VISIBLE);
       }
     });
   }
 
-  /**
-   * Reads the track profile from the provider. This is a blocking function and
-   * should not be run from the UI thread.
-   */
-  private void readProfile() {
+  @Override
+  public void onTrackUpdated(Track track) {
+    if (track == null || track.getStatistics() == null) {
+      trackMaxSpeed = 0.0;
+      return;
+    }
+
+    trackMaxSpeed = track.getStatistics().getMaxSpeed();
+  }
+
+  @Override
+  public void clearTrackPoints() {
     profileLength = 0;
     lastLocation = null;
     startTime = -1;
-    if (selectedTrackId < 0) {
-      return;
-    }
-    Track track = providerUtils.getTrack(selectedTrackId);
-    if (track == null) {
-      return;
-    }
-    lastSeenLocationId = track.getStartId();
-    final ArrayList<double[]> theData = readPointsToList(track);
+    elevationBuffer.reset();
+    chartView.reset();
+    speedBuffer.reset();
+    pendingPoints.clear();
+
     runOnUiThread(new Runnable() {
+      @Override
       public void run() {
-        chartView.setDataPoints(theData);
+        chartView.resetScroll();
       }
     });
   }
 
-  /**
-   * Read all new track points.
-   */
-  private void readNewTrackPoints() {
-    Log.i(MyTracksConstants.TAG, "MyTracks: Updating chart last seen: " + lastSeenLocationId);
-    Track track = providerUtils.getTrack(recordingTrackId);
-    if (track == null) {
-      Log.w(MyTracksConstants.TAG, "MyTracks: track not found");
-      return;
+  @Override
+  public void onNewTrackPoint(Location loc) {
+    if (LocationUtils.isValidLocation(loc)) {
+      double[] point = new double[6];
+      fillDataPoint(loc, point);
+      pendingPoints.add(point);
     }
-    chartView.addDataPoints(readPointsToList(track));
-    uiHandler.post(new Runnable() {
-      public void run() {
-        chartView.invalidate();
-      }
-    });
-    Log.i(MyTracksConstants.TAG, "MyTracks: Updated chart last seen: " + lastSeenLocationId);
   }
 
-  /**
-   * Get the frequency at which points should be displayed.
-   * Limit the number of chart readings. Ideally we would want around 1024.
-   * @param track The track which will be displayed.
-   * @return The inverse of the frequency of points to be displayed.
-   */
-  private int getSamplingFrequency(Track track) {
-    long totalLocations = track.getStopId() - track.getStartId();
-    return Math.max(1, (int) (totalLocations / 1024.0));
+  @Override
+  public void onSampledOutTrackPoint(Location loc) {
+    // Still account for the point in the smoothing buffers.
+    fillDataPoint(loc, null);
   }
 
-  private Cursor getLocationsCursor(long lastLocationRead) {
-    return providerUtils.getLocationsCursor(selectedTrackId, lastLocationRead, BUFFER_SIZE, false);
+  @Override
+  public void onSegmentSplit() {
+    // Do nothing.
   }
 
-  /**
-   * Read all of the points to a list.
-   * @param track The track which will be displayed.
-   * @return 
-   */
-  private ArrayList<double[]> readPointsToList(Track track) {
-    Cursor cursor = null;
-    long lastLocationRead = lastSeenLocationId;
-    int points = 0;
-    int chartSamplingFrequency = getSamplingFrequency(track);
-    ArrayList<double[]> result = new ArrayList<double[]>();
-    // Need two locations so we can keep track of the last location.
-    Location location = new MyTracksLocation("");
-    try {
-      while (lastSeenLocationId < track.getStopId()) {
-        cursor = getLocationsCursor(lastLocationRead);
-        if (cursor != null) {
-          elevationBuffer.reset();
-          speedBuffer.reset();
-          if (cursor.moveToFirst()) {
-            final int idColumnIdx = cursor.getColumnIndexOrThrow(TrackPointsColumns._ID);
-            while (cursor.moveToNext()) {
-              points++;
-              providerUtils.fillLocation(cursor, location);
-              if (MyTracksUtils.isValidLocation(location)) {
-                lastLocationRead = lastSeenLocationId =
-                    cursor.getLong(idColumnIdx);
-                // TODO Can we be smarter about choosing 3 or 6 entries?
-                double[] point = new double[6];
-                location = getDataPoint(location, track, point);
-                if (points % chartSamplingFrequency == 0) {
-                  result.add(point);
-                }
-              }
-            }
-          } else {
-            lastLocationRead += BUFFER_SIZE;
-          }
-        } else {
-          lastLocationRead += BUFFER_SIZE;
-        }
-        cursor.close();
-        cursor = null;
-      }
-      return result;
-    } finally {
-      if (cursor != null) {
-        cursor.close();
-      }
-    }
+  @Override
+  public void onNewTrackPointsDone() {
+    chartView.addDataPoints(pendingPoints);
+    pendingPoints.clear();
+    runOnUiThread(updateChart);
+  }
+
+  @Override
+  public void clearWaypoints() {
+    chartView.clearWaypoints();
+  }
+
+  @Override
+  public void onNewWaypoint(Waypoint wpt) {
+    chartView.addWaypoint(wpt);
+  }
+
+  @Override
+  public void onNewWaypointsDone() {
+    runOnUiThread(updateChart);
+  }
+
+  @Override
+  public boolean onUnitsChanged(boolean metric) {
+    boolean changed = metric != this.metricUnits;
+    if (!changed) return false;
+
+    this.metricUnits = metric;
+
+    chartView.setMetricUnits(metric);
+    
+    return true;  // Reload data
+  }
+
+  @Override
+  public boolean onReportSpeedChanged(boolean reportSpeed) {
+    boolean changed = reportSpeed != this.reportSpeed;
+    if (!changed) return false;
+
+    this.reportSpeed = reportSpeed;
+
+    chartView.setReportSpeed(reportSpeed, this);
+
+    return true;  // Reload data
   }
 }

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

@@ -1,12 +1,12 @@
 /*
  * Copyright 2009 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
@@ -48,7 +48,7 @@ public class ChartValueSeries {
   private double spread;
   private int interval;
   private boolean enabled = true;
-  
+
   /**
    * This class controls how effective min/max values of a {@link ChartValueSeries} are calculated.
    */
@@ -70,10 +70,10 @@ public class ChartValueSeries {
       this.intervals = intervals;
       this.absoluteMin = absoluteMin;
       this.absoluteMax = absoluteMax;
-      this.zoomLevels = zoomLevels; 
+      this.zoomLevels = zoomLevels;
       checkArgs();
     }
-    
+
     private void checkArgs() {
       if (intervals <= 0 || zoomLevels == null || zoomLevels.length == 0) {
         throw new IllegalArgumentException("Expecing positive intervals and non-empty zoom levels");
@@ -100,12 +100,12 @@ public class ChartValueSeries {
     public int[] getZoomLevels() {
       return zoomLevels;
     }
-    
+
     /**
      * Calculates the interval between markings given the min and max values.
      * This function attempts to find the smallest zoom level that fits [min,max] after rounding
      * it to the current zoom level.
-     * 
+     *
      * @param min the minimum value in the series
      * @param max the maximum value in the series
      * @return the calculated interval for the given range
@@ -136,7 +136,7 @@ public class ChartValueSeries {
    * @param fill The paint for filling the chart
    * @param stroke The paint for stroking the outside the chart, optional
    * @param zoomSettings The settings related to zooming
-   * 
+   *
    * TODO: Get rid of Context and inject appropriate values instead.
    */
   public ChartValueSeries(Context context, String formatString, int fillColor, int strokeColor,
@@ -207,7 +207,7 @@ public class ChartValueSeries {
     }
     min = Math.min(min, zoomSettings.getAbsoluteMin());
     max = Math.max(max, zoomSettings.getAbsoluteMax());
-    
+
     this.interval = zoomSettings.calculateInterval(min, max);
     // Round it up.
     effectiveMax = ((int) (max / interval)) * interval + interval;

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

@@ -1,12 +1,12 @@
 /*
  * Copyright 2008 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
@@ -28,9 +28,9 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
-import android.graphics.Path;
 import android.graphics.Paint.Align;
 import android.graphics.Paint.Style;
+import android.graphics.Path;
 import android.graphics.drawable.Drawable;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
@@ -66,36 +66,38 @@ public class ChartView extends View {
   private int maxZoomLevel = 10;
 
   private static final int MAX_INTERVALS = 5;
-  
+
   /*
    * Borders, margins, dimensions (in pixels):
    */
   private int leftBorder = -1;
 
   /**
-   * Unscaled top border of the chart. 
+   * Unscaled top border of the chart.
    */
   private static final int TOP_BORDER = 15;
-  
+
   /**
    * Device scaled top border of the chart.
    */
   private int topBorder;
 
   /**
-   * Unscaled bottom border of the chart. 
+   * Unscaled bottom border of the chart.
    */
   private static final float BOTTOM_BORDER = 40;
-  
+
   /**
    * Device scaled bottom border of the chart.
    */
   private int bottomBorder;
-  
+
   private static final int RIGHT_BORDER = 17;
+
   /** Space to leave for drawing the unit labels */
   private static final int UNIT_BORDER = 15;
   private static final int FONT_HEIGHT = 10;
+
   private int w = 0;
   private int h = 0;
   private int effectiveWidth = 0;
@@ -118,11 +120,11 @@ public class ChartView extends View {
   private ChartValueSeries[] series;
 
   private final ExtremityMonitor xMonitor = new ExtremityMonitor();
-  private final NumberFormat xFormat = new DecimalFormat("###,###");
-  private final NumberFormat xShortFormat = new DecimalFormat("#.0");
+  private static final NumberFormat X_FORMAT = new DecimalFormat("###,###");
+  private static final NumberFormat X_SHORT_FORMAT = new DecimalFormat("#.0");
 
   /*
-   * Paints etc. used when drawing the histogram:
+   * Paints etc. used when drawing the chart:
    */
   private final Paint borderPaint = new Paint();
   private final Paint labelPaint = new Paint();
@@ -174,7 +176,7 @@ public class ChartView extends View {
 
     gridBarPaint.set(gridPaint);
     gridBarPaint.setPathEffect(new DashPathEffect(new float[] {3, 2}, 0));
-    
+
     clearPaint.setStyle(Style.FILL);
     clearPaint.setColor(context.getResources().getColor(R.color.white));
     clearPaint.setAntiAlias(false);
@@ -271,49 +273,12 @@ public class ChartView extends View {
                                               : R.string.pace_label));
   }
 
-  /**
-   * Gets the data that is displayed by the chart.
-   *
-   * @return an array list with data points
-   */
-  public ArrayList<double[]> getData() {
-    return data;
-  }
-
-  /**
-   * Sets the data that is to be displayed by the chart.
-   *
-   * @param theData an array list of data points
-   */
-  public synchronized void setDataPoints(ArrayList<double[]> theData) {
-    scrollTo(0, 0);
-    zoomLevel = 1;
-    data.clear();
-    xMonitor.reset();
-    for (ChartValueSeries cvs : series) {
-      cvs.reset();
-    }
-    addDataPoints(theData);
-  }
-
-  /**
-   * Adds a new data point to the chart.
-   *
-   * @param theData a data point
-   */
-  public synchronized void addDataPoint(double[] theData) {
-    data.add(theData);
-    addDataPointInternal(theData);
-    updateDimensions();
-    setUpPath();
-  }
-
   private void addDataPointInternal(double[] theData) {
     xMonitor.update(theData[0]);
     int min = Math.min(series.length, theData.length - 1);
-    for (int i = 0; i < min; i++) {
-      if (!Double.isNaN(theData[i + 1])) {
-        series[i].update(theData[i + 1]);
+    for (int i = 1; i <= min; i++) {
+      if (!Double.isNaN(theData[i])) {
+        series[i - 1].update(theData[i]);
       }
     }
     // Fill in the extra's if needed.
@@ -329,25 +294,32 @@ public class ChartView extends View {
    *
    * @param theData an array list of data points to be added
    */
-  public synchronized void addDataPoints(ArrayList<double[]> theData) {
-    data.addAll(theData);
-    for (int i = 0; i < theData.size(); i++) {
-      double d[] = theData.get(i);
-      addDataPointInternal(d);
+  public void addDataPoints(ArrayList<double[]> theData) {
+    synchronized (data) {
+      data.addAll(theData);
+      for (int i = 0; i < theData.size(); i++) {
+        double d[] = theData.get(i);
+        addDataPointInternal(d);
+      }
+      updateDimensions();
+      setUpPath();
     }
-    updateDimensions();
-    setUpPath();
   }
 
   /**
    * Clears all data.
-   * Call this only from the UI thread!
    */
-  public synchronized void reset() {
-    data.clear();
-    zoomLevel = 1;
+  public void reset() {
+    synchronized (data) {
+      data.clear();
+      xMonitor.reset();
+      zoomLevel = 1;
+      updateDimensions();
+    }
+  }
+
+  public void resetScroll() {
     scrollTo(0, 0);
-    updateDimensions();
   }
 
   /**
@@ -392,13 +364,6 @@ public class ChartView extends View {
     }
   }
 
-  /**
-   * @return the current zoom level (1 equals to showing all data points)
-   */
-  public int getZoomLevel() {
-    return zoomLevel;
-  }
-
   /**
    * Initiates flinging.
    *
@@ -427,14 +392,6 @@ public class ChartView extends View {
     scrollTo(scrollX, 0);
   }
 
-  /**
-   * Sets the scroll position of the chart. This will trigger a redraw.
-   */
-  @Override
-  public void scrollTo(int x, int y) {
-    super.scrollTo(x, y);
-  }
-
   /**
    * @return the current display mode (by distance, by time)
    */
@@ -527,8 +484,8 @@ public class ChartView extends View {
           }
           if (nearestWaypoint != null && dmin < 100) {
             Intent intent =
-                new Intent(getContext(), MyTracksWaypointDetails.class);
-            intent.putExtra("waypointid", nearestWaypoint.getId());
+                new Intent(getContext(), WaypointDetails.class);
+            intent.putExtra(WaypointDetails.WAYPOINT_ID_EXTRA, nearestWaypoint.getId());
             getContext().startActivity(intent);
             return true;
           }
@@ -551,38 +508,82 @@ public class ChartView extends View {
   }
 
   @Override
-  protected synchronized void onDraw(Canvas c) {
-    if (w != c.getWidth() || h != c.getHeight()) {
-      // Dimensions have changed (for example due to orientation change).
-      w = c.getWidth();
-      h = c.getHeight();
-      effectiveWidth = Math.max(0, w - leftBorder - RIGHT_BORDER);
-      effectiveHeight = Math.max(0, h - topBorder - bottomBorder);
-      setUpPath();
-    }
-    c.save();
-    c.drawColor(Color.WHITE);
-    if (data.size() < 1) {
-      drawXAxis(c);
-      drawYAxis(c);
-      c.restore();
-      return;
-    }
-    
-    c.save();
-    c.clipRect(leftBorder + 1 + getScrollX(), topBorder + 1,
-        w - RIGHT_BORDER + getScrollX() - 1, h - bottomBorder - 1);
+  protected void onDraw(Canvas c) {
+    synchronized (data) {
+      updateEffectiveDimensionsIfChanged(c);
 
-    drawGrid(c);
-    
-    // Draw the data series.
-    for (ChartValueSeries cvs : series) {
-      if (cvs.isEnabled() && cvs.hasData()) {
-        cvs.drawPath(c);
+      // Keep original state.
+      c.save();
+
+      c.drawColor(Color.WHITE);
+
+      if (data.isEmpty()) {
+        // No data, draw only axes
+        drawXAxis(c);
+        drawYAxis(c);
+        c.restore();
+        return;
+      }
+
+      // Clip to graph drawing space
+      c.save();
+      clipToGraphSpace(c);
+
+      // Draw the grid and the data on it.
+      drawGrid(c);
+      drawDataSeries(c);
+      drawWaypoints(c);
+
+      // Go back to full canvas drawing.
+      c.restore();
+
+      // Draw the axes and their labels.
+      drawAxesAndLabels(c);
+
+      // Go back to original state.
+      c.restore();
+
+      // Draw the pointer
+      if (showPointer) {
+        drawPointer(c);
       }
     }
-    
-    // Draw the waypoints.
+  }
+
+  /** Clips the given canvas to the area where the graph lines should be drawn. */
+  private void clipToGraphSpace(Canvas c) {
+    c.clipRect(leftBorder + 1 + getScrollX(), topBorder + 1,
+        w - RIGHT_BORDER + getScrollX() - 1, h - bottomBorder - 1);
+  }
+
+  /** Draws the axes and their labels into th e given canvas. */
+  private void drawAxesAndLabels(Canvas c) {
+    drawXLabels(c);
+    drawXAxis(c);
+    drawSeriesTitles(c);
+
+    c.translate(getScrollX(), 0);
+    drawYAxis(c);
+    float density = getContext().getResources().getDisplayMetrics().density;
+    final int spacer = (int) (5 * density);
+    int x = leftBorder - spacer;
+    for (ChartValueSeries cvs : series) {
+      if (cvs.isEnabled() && cvs.hasData()) {
+        x -= drawYLabels(cvs, c, x) + spacer;
+      }
+    }
+  }
+
+  /** Draws the current pointer into the given canvas. */
+  private void drawPointer(Canvas c) {
+    c.translate(getX(maxX) - pointer.getIntrinsicWidth() / 2,
+                getY(series[0], data.get(data.size() - 1)[1])
+                - pointer.getIntrinsicHeight() / 2 - 12);
+    pointer.draw(c);
+  }
+
+  /** Draws the waypoints into the given canvas. */
+  private void drawWaypoints(Canvas c) {
     for (int i = 1; i < waypoints.size(); i++) {
       final Waypoint waypoint = waypoints.get(i);
       if (waypoint.getLocation() == null) {
@@ -600,33 +601,18 @@ public class ChartView extends View {
       }
       c.restore();
     }
+  }
 
-    c.restore();
-    
-    // Draw the axis and labels.
-    drawXLabels(c);
-    drawXAxis(c);
-    drawSeriesTitles(c);
-    
-    c.translate(getScrollX(), 0);
-    drawYAxis(c);
-    float density = getContext().getResources().getDisplayMetrics().density;
-    final int spacer = (int) (5 * density);
-    int x = leftBorder - spacer;
+  /** Draws the data series into the given canvas. */
+  private void drawDataSeries(Canvas c) {
     for (ChartValueSeries cvs : series) {
       if (cvs.isEnabled() && cvs.hasData()) {
-        x -= drawYLabels(cvs, c, x) + spacer;
+        cvs.drawPath(c);
       }
     }
-    c.restore();
-    if (showPointer && !data.isEmpty()) {
-      c.translate(getX(maxX) - pointer.getIntrinsicWidth() / 2,
-                  getY(series[0], data.get(data.size() - 1)[1])
-                  - pointer.getIntrinsicHeight() / 2 - 12);
-      pointer.draw(c);
-    }
   }
 
+  /** Draws the colored titles for the data series. */
   private void drawSeriesTitles(Canvas c) {
     int sections = 1;
     for (ChartValueSeries cvs : series) {
@@ -644,17 +630,24 @@ public class ChartView extends View {
   }
 
   /**
-   * Sets up the path that is used to draw the histogram in onDraw(). The path
+   * Sets up the path that is used to draw the chart in onDraw(). The path
    * needs to be updated any time after the data or histogram dimensions change.
    */
-  private synchronized void setUpPath() {
-    for (ChartValueSeries cvs : series) {
-      cvs.getPath().reset();
-    }
-    if (data.isEmpty()) {
-      return;
-    }
+  private void setUpPath() {
+    synchronized (data) {
+      for (ChartValueSeries cvs : series) {
+        cvs.getPath().reset();
+      }
 
+      if (!data.isEmpty()) {
+        drawPaths();
+        closePaths();
+      }
+    }
+  }
+
+  /** Actually draws the data points as a path. */
+  private void drawPaths() {
     // All of the data points to the respective series.
     // TODO: Come up with a better sampling than Math.max(1, (maxZoomLevel - zoomLevel + 1) / 2);
     int sampling = 1;
@@ -673,7 +666,10 @@ public class ChartView extends View {
         }
       }
     }
+  }
 
+  /** Closes the drawn path so it looks like a solid graph. */
+  private void closePaths() {
     // Close the path.
     int yCorner = topBorder + effectiveHeight;
     int xCorner = getX(data.get(0)[0]);
@@ -692,12 +688,13 @@ public class ChartView extends View {
       }
     }
   }
- 
+
   /**
-   * Find the index of the first point which has a series populated.
-   * @param seriesIndex The index of the value series to search for.
+   * Finds the index of the first point which has a series populated.
+   *
+   * @param seriesIndex The index of the value series to search for
    * @return The index in the first data for the point in the series that has series
-   *         index value populated or -1 if none is found.
+   *         index value populated or -1 if none is found
    */
   private int getFirstPointPopulatedIndex(int seriesIndex) {
     for (int i = 0; i < data.size(); i++) {
@@ -709,7 +706,7 @@ public class ChartView extends View {
   }
 
   /**
-   * Update the histogram dimensions.
+   * Updates the chart dimensions.
    */
   private void updateDimensions() {
     maxX = xMonitor.getMax();
@@ -728,12 +725,31 @@ public class ChartView extends View {
       }
     }
     float density = getContext().getResources().getDisplayMetrics().density;
-    // TODO: This should be function of the number of variables displayed.
+    maxLength = Math.max(maxLength, 1);
     leftBorder = (int) (density * (4 + 8 * maxLength));
-    effectiveWidth = w - leftBorder - RIGHT_BORDER;
     bottomBorder = (int) (density * BOTTOM_BORDER);
     topBorder = (int) (density * TOP_BORDER);
-    effectiveHeight = h - topBorder - bottomBorder;
+    updateEffectiveDimensions();
+  }
+
+  /** Updates the effective dimensions where the graph will be drawn. */
+  private void updateEffectiveDimensions() {
+    effectiveWidth = Math.max(0, w - leftBorder - RIGHT_BORDER);
+    effectiveHeight = Math.max(0, h - topBorder - bottomBorder);
+  }
+
+  /**
+   * Updates the effective dimensions where the graph will be drawn, only if the
+   * dimensions of the given canvas have changed since the last call.
+   */
+  private void updateEffectiveDimensionsIfChanged(Canvas c) {
+    if (w != c.getWidth() || h != c.getHeight()) {
+      // Dimensions have changed (for example due to orientation change).
+      w = c.getWidth();
+      h = c.getHeight();
+      updateEffectiveDimensions();
+      setUpPath();
+    }
   }
 
   private int getX(double distance) {
@@ -746,6 +762,7 @@ public class ChartView extends View {
         - (int) ((y - cvs.getMin()) * effectiveHeight / effectiveSpread);
   }
 
+  /** Draws the labels on the X axis into the given canvas. */
   private void drawXLabels(Canvas c) {
     double interval = (int) (maxX / zoomLevel / 4);
     boolean shortFormat = false;
@@ -770,6 +787,7 @@ public class ChartView extends View {
     }
   }
 
+  /** Draws the labels on the Y axis into the given canvas. */
   private float drawYLabels(ChartValueSeries cvs, Canvas c, int x) {
     int interval = cvs.getInterval();
     float maxTextWidth = 0;
@@ -779,13 +797,14 @@ public class ChartView extends View {
     return maxTextWidth;
   }
 
+  /** Draws a single label on the X axis. */
   private void drawXLabel(Canvas c, double x, boolean shortFormat) {
     if (x < 0) {
       return;
     }
     String s =
         (mode == Mode.BY_DISTANCE)
-            ? (shortFormat ? xShortFormat.format(x) : xFormat.format(x))
+            ? (shortFormat ? X_SHORT_FORMAT.format(x) : X_FORMAT.format(x))
             : StringUtils.formatTime((long) x);
     c.drawText(s,
                getX(x),
@@ -793,6 +812,7 @@ public class ChartView extends View {
                labelPaint);
   }
 
+  /** Draws a single label on the Y axis. */
   private float drawYLabel(ChartValueSeries cvs, Canvas c, int x, int y) {
     int desiredY = (int) ((y - cvs.getMin()) * effectiveHeight /
         (cvs.getInterval() * MAX_INTERVALS));
@@ -804,6 +824,7 @@ public class ChartView extends View {
     return p.measureText(text);
   }
 
+  /** Draws the actual X axis line and its label. */
   private void drawXAxis(Canvas canvas) {
     float rightEdge = getX(maxX);
     final int y = effectiveHeight + topBorder;
@@ -815,6 +836,7 @@ public class ChartView extends View {
     canvas.drawText(s, rightEdge, effectiveHeight + .2f * UNIT_BORDER + topBorder, labelPaint);
   }
 
+  /** Draws the actual Y axis line and its label. */
   private void drawYAxis(Canvas canvas) {
     canvas.drawRect(0, 0,
         leftBorder - 1, effectiveHeight + topBorder + UNIT_BORDER + 1,
@@ -826,18 +848,15 @@ public class ChartView extends View {
       int y = i * effectiveHeight / MAX_INTERVALS + topBorder;
       canvas.drawLine(leftBorder - 5, y, leftBorder, y, gridPaint);
     }
-    
+
     Context c = getContext();
     // TODO: This should really show units for all series.
     String s = metricUnits ? c.getString(R.string.meter) : c.getString(R.string.feet);
     canvas.drawText(s, leftBorder - UNIT_BORDER * .2f, UNIT_BORDER * .8f + topBorder, labelPaint);
   }
-  
-  private synchronized void drawGrid(Canvas c) {
-    if (data.isEmpty()) {
-      return;
-    }
-    
+
+  /** Draws the grid for the graph. */
+  private void drawGrid(Canvas c) {
     float rightEdge = getX(maxX);
     for (int i = 1; i < MAX_INTERVALS; ++i) {
       int y = i * effectiveHeight / MAX_INTERVALS + topBorder;

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

@@ -78,7 +78,7 @@ class CheckUnits {
 
   private static void accept(Context context, SharedPreferences preferences) {
     recordCheckPerformed(preferences);
-    Intent startIntent = new Intent(context, MyTracksSettings.class);
+    Intent startIntent = new Intent(context, SettingsActivity.class);
     context.startActivity(startIntent);
   }
 

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

@@ -20,18 +20,13 @@ package com.google.android.apps.mytracks;
  *
  * @author Leif Hendrik Wilden
  */
-public abstract class MyTracksConstants {
+public abstract class Constants {
 
   /**
    * Should be used by all log statements
    */
   public static final String TAG = "MyTracks";
-
-  /**
-   * Name of the gps location provider:
-   */
-  public static final String GPS_PROVIDER = "gps";
-
+  
   /**
    * Name of the top-level directory inside the SD card where our files will
    * be read from/written to.
@@ -140,6 +135,12 @@ public abstract class MyTracksConstants {
    */
   public static final int MAX_LOADED_TRACK_POINTS = 20000;
 
+  /**
+   * Maximum number of track points ever loaded at once from the provider into
+   * memory in a single call to read points.
+   */
+  public static final int MAX_LOADED_TRACK_POINTS_PER_BATCH = 1000;
+
   /**
    * Maximum number of way points displayed by the map overlay.
    */
@@ -168,6 +169,12 @@ public abstract class MyTracksConstants {
    */
   public static final double MAX_ACCELERATION = 0.02;
 
+  /** Maximum age of a GPS location to be considered current. */
+  public static final long MAX_LOCATION_AGE_MS = 60 * 1000;  // 1 minute
+
+  /** Maximum age of a network location to be considered current. */
+  public static final long MAX_NETWORK_AGE_MS = 1000 * 60 * 10;  // 10 minutes
+
   /**
    * The type of account that we can use for gdata uploads.
    */
@@ -182,32 +189,32 @@ public abstract class MyTracksConstants {
 
   public static int getActionFromMenuId(int menuId) {
     switch (menuId) {
-      case MyTracksConstants.MENU_SEND_TO_GOOGLE:
-        return MyTracksConstants.SEND_TO_GOOGLE_DIALOG;
-      case MyTracksConstants.MENU_EDIT:
-        return MyTracksConstants.EDIT_DETAILS;
-      case MyTracksConstants.MENU_DELETE:
-        return MyTracksConstants.DELETE_TRACK;
-      case MyTracksConstants.MENU_SHARE_LINK:
-        return MyTracksConstants.SHARE_LINK;
-      case MyTracksConstants.MENU_SHARE_KML_FILE:
-        return MyTracksConstants.SHARE_KML_FILE;
-      case MyTracksConstants.MENU_SHARE_GPX_FILE:
-        return MyTracksConstants.SHARE_GPX_FILE;
-      case MyTracksConstants.MENU_SHARE_CSV_FILE:
-        return MyTracksConstants.SHARE_CSV_FILE;
-      case MyTracksConstants.MENU_SHARE_TCX_FILE:
-        return MyTracksConstants.SHARE_TCX_FILE;
-      case MyTracksConstants.MENU_SAVE_GPX_FILE:
-        return MyTracksConstants.SAVE_GPX_FILE;
-      case MyTracksConstants.MENU_SAVE_KML_FILE:
-        return MyTracksConstants.SAVE_KML_FILE;
-      case MyTracksConstants.MENU_SAVE_CSV_FILE:
-        return MyTracksConstants.SAVE_CSV_FILE;
-      case MyTracksConstants.MENU_SAVE_TCX_FILE:
-        return MyTracksConstants.SAVE_TCX_FILE;
-      case MyTracksConstants.MENU_CLEAR_MAP:
-        return MyTracksConstants.CLEAR_MAP;
+      case Constants.MENU_SEND_TO_GOOGLE:
+        return Constants.SEND_TO_GOOGLE_DIALOG;
+      case Constants.MENU_EDIT:
+        return Constants.EDIT_DETAILS;
+      case Constants.MENU_DELETE:
+        return Constants.DELETE_TRACK;
+      case Constants.MENU_SHARE_LINK:
+        return Constants.SHARE_LINK;
+      case Constants.MENU_SHARE_KML_FILE:
+        return Constants.SHARE_KML_FILE;
+      case Constants.MENU_SHARE_GPX_FILE:
+        return Constants.SHARE_GPX_FILE;
+      case Constants.MENU_SHARE_CSV_FILE:
+        return Constants.SHARE_CSV_FILE;
+      case Constants.MENU_SHARE_TCX_FILE:
+        return Constants.SHARE_TCX_FILE;
+      case Constants.MENU_SAVE_GPX_FILE:
+        return Constants.SAVE_GPX_FILE;
+      case Constants.MENU_SAVE_KML_FILE:
+        return Constants.SAVE_KML_FILE;
+      case Constants.MENU_SAVE_CSV_FILE:
+        return Constants.SAVE_CSV_FILE;
+      case Constants.MENU_SAVE_TCX_FILE:
+        return Constants.SAVE_TCX_FILE;
+      case Constants.MENU_CLEAR_MAP:
+        return Constants.CLEAR_MAP;
       default:
         return -1;
     }
@@ -216,8 +223,22 @@ public abstract class MyTracksConstants {
   public static final String MAPSHOP_BASE_URL =
     "http://maps.google.com/maps/ms";
 
+  /*
+   * Default values - keep in sync with those in preferences.xml.
+   */
+
+  public static final int DEFAULT_ANNOUNCEMENT_FREQUENCY = -1;
+  public static final int DEFAULT_AUTO_RESUME_TRACK_TIMEOUT = 10;  // In min.
+  public static final int DEFAULT_MAX_RECORDING_DISTANCE = 200;
+  public static final int DEFAULT_MIN_RECORDING_DISTANCE = 5;
+  public static final int DEFAULT_MIN_RECORDING_INTERVAL = 0;
+  public static final int DEFAULT_MIN_REQUIRED_ACCURACY = 200;
+  public static final int DEFAULT_SPLIT_FREQUENCY = 0;
+
+  public static final String SETTINGS_NAME = "SettingsActivity";
+
   /**
    * This is an abstract utility class.
    */
-  protected MyTracksConstants() { }
+  protected Constants() { }
 }

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

@@ -34,12 +34,12 @@ import android.util.Log;
  *
  * @author Leif Hendrik Wilden
  */
-public class MyTracksDeleteAllTracks extends Handler {
+public class DeleteAllTracks extends Handler {
 
   private final Context context;
   private final Runnable done;
 
-  public MyTracksDeleteAllTracks(Context context, Runnable done) {
+  public DeleteAllTracks(Context context, Runnable done) {
     this.context = context;
     this.done = done;
   }
@@ -58,11 +58,12 @@ public class MyTracksDeleteAllTracks extends Handler {
         new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog, int i) {
             dialog.dismiss();
-            Log.w(MyTracksConstants.TAG, "deleting all!");
+            Log.w(Constants.TAG, "deleting all!");
             MyTracksProviderUtils.Factory.get(context).deleteAllTracks();
             SharedPreferences prefs =
-                context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+                context.getSharedPreferences(Constants.SETTINGS_NAME, 0);
             SharedPreferences.Editor editor = prefs.edit();
+            // TODO: Go through data manager
             editor.putLong(context.getString(R.string.selected_track_key), -1);
             ApiFeatures.getInstance().getApiPlatformAdapter().applyPreferenceChanges(editor);
             if (done != null) {

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

@@ -15,6 +15,8 @@
  */
 package com.google.android.apps.mytracks;
 
+import static com.google.android.apps.mytracks.Constants.TAG;
+
 import com.google.android.apps.mytracks.io.sendtogoogle.SendDialog;
 import com.google.android.maps.mytracks.R;
 
@@ -37,11 +39,9 @@ public class DialogManager {
   public static final int DIALOG_IMPORT_PROGRESS = 2;
   public static final int DIALOG_PROGRESS = 3;
   public static final int DIALOG_SEND_TO_GOOGLE = 4;
-  public static final int DIALOG_WRITE_PROGRESS = 5;
 
   private ProgressDialog progressDialog;
   private ProgressDialog importProgressDialog;
-  private ProgressDialog writeProgressDialog;
   private SendDialog sendToGoogleDialog;
   private ChartSettingsDialog chartSettingsDialog;
 
@@ -77,15 +77,6 @@ public class DialogManager {
       case DIALOG_SEND_TO_GOOGLE:
         sendToGoogleDialog = new SendDialog(activity);
         return sendToGoogleDialog;
-      case DIALOG_WRITE_PROGRESS:
-        writeProgressDialog = new ProgressDialog(activity);
-        writeProgressDialog.setIcon(android.R.drawable.ic_dialog_info);
-        writeProgressDialog.setTitle(
-            activity.getString(R.string.progress_title));
-        writeProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        writeProgressDialog.setMessage(
-            activity.getString(R.string.write_progress_message));
-        return writeProgressDialog;
     }
     return null;
   }
@@ -96,7 +87,7 @@ public class DialogManager {
         activity.resetSendToGoogleStatus();
         break;
       case DIALOG_CHART_SETTINGS:
-        Log.d(MyTracksConstants.TAG, "MyTracks.onPrepare chart dialog");
+        Log.d(TAG, "MyTracks.onPrepare chart dialog");
         chartSettingsDialog.setup(activity.getChartActivity());
         break;
     }
@@ -170,11 +161,9 @@ public class DialogManager {
         try {
           activity.showDialog(id);
         } catch (BadTokenException e) {
-          Log.w(MyTracksConstants.TAG,
-              "Could not display dialog with id " + id, e);
+          Log.w(TAG, "Could not display dialog with id " + id, e);
         } catch (IllegalStateException e) {
-          Log.w(MyTracksConstants.TAG,
-              "Could not display dialog with id " + id, e);
+          Log.w(TAG, "Could not display dialog with id " + id, e);
         }
       }
     });
@@ -190,9 +179,9 @@ public class DialogManager {
         try {
           dialog.show();
         } catch (BadTokenException e) {
-          Log.w(MyTracksConstants.TAG, "Could not display dialog", e);
+          Log.w(TAG, "Could not display dialog", e);
         } catch (IllegalStateException e) {
-          Log.w(MyTracksConstants.TAG, "Could not display dialog", e);
+          Log.w(TAG, "Could not display dialog", e);
         }
       }
     });
@@ -213,4 +202,19 @@ public class DialogManager {
     });
   }
 
+  /**
+   * The equivalent of {@link #dismissDialogSafely(int)}, but for a specific
+   * dialog instance.
+   */
+  public static void dismissDialogSafely(Activity activity, final Dialog dialog) {
+    activity.runOnUiThread(new Runnable() {
+      public void run() {
+        try {
+          dialog.dismiss();
+        } catch (IllegalArgumentException e) {
+          // This will be thrown if this dialog was not shown before.
+        }
+      }
+    });
+  }
 }

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

@@ -98,7 +98,7 @@ class Eula {
     ApiFeatures.getInstance().getApiPlatformAdapter().applyPreferenceChanges(
         preferences.edit().putBoolean(PREFERENCE_EULA_ACCEPTED, true));
     Intent startIntent = new Intent(activity, WelcomeActivity.class);
-    activity.startActivityForResult(startIntent, MyTracksConstants.WELCOME);
+    activity.startActivityForResult(startIntent, Constants.WELCOME);
   }
 
   private static void refuse(Activity activity) {

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

@@ -17,10 +17,10 @@ package com.google.android.apps.mytracks;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.TracksColumns;
-import com.google.android.apps.mytracks.io.TrackWriter;
-import com.google.android.apps.mytracks.io.TrackWriterFactory;
-import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat;
-import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.apps.mytracks.io.file.TrackWriter;
+import com.google.android.apps.mytracks.io.file.TrackWriterFactory;
+import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
+import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -71,14 +71,14 @@ public class ExportAllTracks {
               format = TrackFileFormat.TCX;
               break;
             default:
-              Log.w(MyTracksConstants.TAG, "Unknown export format: " + which);
+              Log.w(Constants.TAG, "Unknown export format: " + which);
           }
         }
       };
 
   public ExportAllTracks(Activity activity) {
     this.activity = activity;
-    Log.i(MyTracksConstants.TAG, "ExportAllTracks: Starting");
+    Log.i(Constants.TAG, "ExportAllTracks: Starting");
 
     AlertDialog.Builder builder = new AlertDialog.Builder(activity);
     builder.setSingleChoiceItems(R.array.export_formats, 0, itemClick);
@@ -113,14 +113,14 @@ public class ExportAllTracks {
    */
   private void aquireLocksAndExport() {
     SharedPreferences prefs =
-        activity.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+        activity.getSharedPreferences(Constants.SETTINGS_NAME, 0);
     long recordingTrackId = -1;
     if (prefs != null) {
       recordingTrackId =
     	  prefs.getLong(activity.getString(R.string.recording_track_key), -1);
     }
     if (recordingTrackId != -1) {
-      wakeLock = MyTracksUtils.acquireWakeLock(activity, wakeLock);
+      wakeLock = SystemUtils.acquireWakeLock(activity, wakeLock);
     }
 
     // Now we can safely export everything.
@@ -130,9 +130,9 @@ public class ExportAllTracks {
     // TODO check what happens if we started recording after getting this lock.
     if (wakeLock != null && wakeLock.isHeld()) {
       wakeLock.release();
-      Log.i(MyTracksConstants.TAG, "ExportAllTracks: Releasing wake lock.");
+      Log.i(Constants.TAG, "ExportAllTracks: Releasing wake lock.");
     }
-    Log.i(MyTracksConstants.TAG, "ExportAllTracks: Done");
+    Log.i(Constants.TAG, "ExportAllTracks: Done");
     Toast.makeText(activity, R.string.export_done, Toast.LENGTH_SHORT).show();
   }
 
@@ -163,7 +163,7 @@ public class ExportAllTracks {
       }
 
       final int trackCount = cursor.getCount();
-      Log.i(MyTracksConstants.TAG,
+      Log.i(Constants.TAG,
           "ExportAllTracks: Exporting: " + cursor.getCount() + " tracks.");
       int idxTrackId = cursor.getColumnIndexOrThrow(TracksColumns._ID);
       activity.runOnUiThread(new Runnable() {
@@ -186,7 +186,7 @@ public class ExportAllTracks {
         });
 
         long id = cursor.getLong(idxTrackId);
-        Log.i(MyTracksConstants.TAG, "ExportAllTracks: exporting: " + id);
+        Log.i(Constants.TAG, "ExportAllTracks: exporting: " + id);
         TrackWriter writer =
             TrackWriterFactory.newWriter(activity, providerUtils, id, format);
         writer.writeTrack();

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

@@ -16,9 +16,9 @@
 package com.google.android.apps.mytracks;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
-import com.google.android.apps.mytracks.io.GpxImporter;
+import com.google.android.apps.mytracks.io.file.GpxImporter;
 import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -60,7 +60,7 @@ public class ImportAllTracks {
 
   public ImportAllTracks(Activity activity) {
     this.activity = activity;
-    Log.i(MyTracksConstants.TAG, "ImportAllTracks: Starting");
+    Log.i(Constants.TAG, "ImportAllTracks: Starting");
     fileUtils = new FileUtils();
     gpxPath = fileUtils.buildExternalDirectoryPath("gpx");
     HandlerThread handlerThread;
@@ -82,13 +82,13 @@ public class ImportAllTracks {
    * track. Acquire a wake lock if there is no current track.
    */
   private void aquireLocksAndImport() {
-    SharedPreferences prefs = activity.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+    SharedPreferences prefs = activity.getSharedPreferences(Constants.SETTINGS_NAME, 0);
     long recordingTrackId = -1;
     if (prefs != null) {
       recordingTrackId = prefs.getLong(activity.getString(R.string.recording_track_key), -1);
     }
     if (recordingTrackId != -1) {
-      wakeLock = MyTracksUtils.acquireWakeLock(activity, wakeLock);
+      wakeLock = SystemUtils.acquireWakeLock(activity, wakeLock);
     }
 
     // Now we can safely import everything.
@@ -98,10 +98,10 @@ public class ImportAllTracks {
     // TODO check what happens if we started recording after getting this lock.
     if (wakeLock != null && wakeLock.isHeld()) {
       wakeLock.release();
-      Log.i(MyTracksConstants.TAG, "ImportAllTracks: Releasing wake lock.");
+      Log.i(Constants.TAG, "ImportAllTracks: Releasing wake lock.");
     }
 
-    Log.i(MyTracksConstants.TAG, "ImportAllTracks: Done");
+    Log.i(Constants.TAG, "ImportAllTracks: Done");
     AlertDialog.Builder builder = new AlertDialog.Builder(activity);
     if (gpxFileCount == 0) {
       builder.setMessage(activity.getString(R.string.import_empty, gpxPath + "/"));
@@ -141,7 +141,7 @@ public class ImportAllTracks {
       return;
     }
 
-    Log.i(MyTracksConstants.TAG, "ImportAllTracks: Importing: " + gpxFileCount + " tracks.");
+    Log.i(Constants.TAG, "ImportAllTracks: Importing: " + gpxFileCount + " tracks.");
     activity.runOnUiThread(new Runnable() {
       public void run() {
         makeProgressDialog(gpxFileCount);
@@ -180,19 +180,19 @@ public class ImportAllTracks {
    * notifications and returns false on failure.
    */
   private boolean importFile(File gpxFile, MyTracksProviderUtils providerUtils) {
-    Log.i(MyTracksConstants.TAG, "ImportAllTracks: importing: " + gpxFile.getName());
+    Log.i(Constants.TAG, "ImportAllTracks: importing: " + gpxFile.getName());
     try {
       GpxImporter.importGPXFile(new FileInputStream(gpxFile), providerUtils);
       return true;
     } catch (FileNotFoundException e) {
-      Log.w(MyTracksConstants.TAG, "GPX file wasn't found/went missing: "
+      Log.w(Constants.TAG, "GPX file wasn't found/went missing: "
           + gpxFile.getAbsolutePath(), e);
     } catch (ParserConfigurationException e) {
-      Log.w(MyTracksConstants.TAG, "Error parsing file: " + gpxFile.getAbsolutePath(), e);
+      Log.w(Constants.TAG, "Error parsing file: " + gpxFile.getAbsolutePath(), e);
     } catch (SAXException e) {
-      Log.w(MyTracksConstants.TAG, "Error parsing file: " + gpxFile.getAbsolutePath(), e);
+      Log.w(Constants.TAG, "Error parsing file: " + gpxFile.getAbsolutePath(), e);
     } catch (IOException e) {
-      Log.w(MyTracksConstants.TAG, "Error reading file: " + gpxFile.getAbsolutePath(), e);
+      Log.w(Constants.TAG, "Error reading file: " + gpxFile.getAbsolutePath(), e);
     }
     Toast.makeText(activity, activity.getString(R.string.import_error, gpxFile.getName()),
         Toast.LENGTH_LONG).show();

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

@@ -0,0 +1,577 @@
+/*
+ * Copyright 2008 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;
+
+import static com.google.android.apps.mytracks.Constants.TAG;
+
+import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
+import com.google.android.apps.mytracks.content.Track;
+import com.google.android.apps.mytracks.content.TrackDataHub;
+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.tasks.StatusAnnouncerFactory;
+import com.google.android.apps.mytracks.stats.TripStatistics;
+import com.google.android.apps.mytracks.util.ApiFeatures;
+import com.google.android.apps.mytracks.util.GeoRect;
+import com.google.android.apps.mytracks.util.LocationUtils;
+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.content.Intent;
+import android.location.Location;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.SubMenu;
+import android.view.View;
+import android.view.View.OnCreateContextMenuListener;
+import android.view.Window;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import java.util.EnumSet;
+
+/**
+ * The map view activity of the MyTracks application.
+ *
+ * @author Leif Hendrik Wilden
+ * @author Rodrigo Damazio
+ */
+public class MapActivity extends com.google.android.maps.MapActivity
+    implements View.OnTouchListener, View.OnClickListener,
+        TrackDataListener {
+
+  // Saved instance state keys:
+  // ---------------------------
+
+  private static final String KEY_CURRENT_LOCATION = "currentLocation";
+  private static final String KEY_KEEP_MY_LOCATION_VISIBLE = "keepMyLocationVisible";
+
+  private TrackDataHub dataHub;
+
+  /**
+   * True if the map should be scrolled so that the pointer is always in the
+   * visible area.
+   */
+  private boolean keepMyLocationVisible;
+
+  /**
+   * The current pointer location.
+   * This is kept to quickly center on it when the user requests.
+   */
+  private Location currentLocation;
+
+  // UI elements:
+  // -------------
+
+  private RelativeLayout screen;
+  private MapView mapView;
+  private MapOverlay mapOverlay;
+  private LinearLayout messagePane;
+  private TextView messageText;
+  private LinearLayout busyPane;
+  private ImageButton optionsBtn;
+
+  private MenuItem myLocation;
+  private MenuItem toggleLayers;
+
+  /**
+   * We are not displaying driving directions. Just an arbitrary track that is
+   * not associated to any licensed mapping data. Therefore it should be okay to
+   * return false here and still comply with the terms of service.
+   */
+  @Override
+  protected boolean isRouteDisplayed() {
+    return false;
+  }
+
+  /**
+   * We are displaying a location. This needs to return true in order to comply
+   * with the terms of service.
+   */
+  @Override
+  protected boolean isLocationDisplayed() {
+    return true;
+  }
+
+  // Application life cycle:
+  // ------------------------
+
+  @Override
+  public void onCreate(Bundle bundle) {
+    Log.d(TAG, "MapActivity.onCreate");
+    super.onCreate(bundle);
+
+    // The volume we want to control is the Text-To-Speech volume
+    int volumeStream =
+        new StatusAnnouncerFactory(ApiFeatures.getInstance()).getVolumeStream();
+    setVolumeControlStream(volumeStream);
+
+    dataHub = MyTracks.getInstance().getDataHub();
+
+    // We don't need a window title bar:
+    requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+    // Inflate the layout:
+    setContentView(R.layout.mytracks_layout);
+
+    // Remove the window's background because the MapView will obscure it
+    getWindow().setBackgroundDrawable(null);
+
+    // Set up a map overlay:
+    screen = (RelativeLayout) findViewById(R.id.screen);
+    mapView = (MapView) findViewById(R.id.map);
+    mapView.requestFocus();
+    mapOverlay = new MapOverlay(this);
+    mapView.getOverlays().add(mapOverlay);
+    mapView.setOnTouchListener(this);
+    mapView.setBuiltInZoomControls(true);
+    messagePane = (LinearLayout) findViewById(R.id.messagepane);
+    messageText = (TextView) findViewById(R.id.messagetext);
+    busyPane = (LinearLayout) findViewById(R.id.busypane);
+    optionsBtn = (ImageButton) findViewById(R.id.showOptions);
+
+    optionsBtn.setOnCreateContextMenuListener(contextMenuListener);
+    optionsBtn.setOnClickListener(this);
+  }
+
+  @Override
+  protected void onRestoreInstanceState(Bundle bundle) {
+    Log.d(TAG, "MapActivity.onRestoreInstanceState");
+    if (bundle != null) {
+      super.onRestoreInstanceState(bundle);
+      keepMyLocationVisible =
+          bundle.getBoolean(KEY_KEEP_MY_LOCATION_VISIBLE, false);
+      if (bundle.containsKey(KEY_CURRENT_LOCATION)) {
+        currentLocation = (Location) bundle.getParcelable(KEY_CURRENT_LOCATION);
+        if (currentLocation != null) {
+          showCurrentLocation();
+        }
+      } else {
+        currentLocation = null;
+      }
+    }
+  }
+
+  @Override
+  protected void onResume() {
+    Log.d(TAG, "MapActivity.onStart");
+    super.onResume();
+
+    dataHub.registerTrackDataListener(this, EnumSet.of(
+        ListenerDataType.SELECTED_TRACK_CHANGED,
+        ListenerDataType.POINT_UPDATES,
+        ListenerDataType.WAYPOINT_UPDATES,
+        ListenerDataType.LOCATION_UPDATES,
+        ListenerDataType.COMPASS_UPDATES));
+  }
+
+  @Override
+  protected void onSaveInstanceState(Bundle outState) {
+    Log.d(TAG, "MapActivity.onSaveInstanceState");
+    outState.putBoolean(KEY_KEEP_MY_LOCATION_VISIBLE, keepMyLocationVisible);
+    if (currentLocation != null) {
+      outState.putParcelable(KEY_CURRENT_LOCATION, currentLocation);
+    }
+    super.onSaveInstanceState(outState);
+  }
+
+  @Override
+  protected void onPause() {
+    Log.d(TAG, "MapActivity.onStop");
+
+    dataHub.unregisterTrackDataListener(this);
+
+    super.onPause();
+  }
+
+  // Utility functions:
+  // -------------------
+
+  /**
+   * Shows the options button if a track is selected, or hide it if not.
+   */
+  private void updateOptionsButton(boolean trackSelected) {
+    optionsBtn.setVisibility(
+        trackSelected ? View.VISIBLE : View.INVISIBLE);
+  }
+
+  /**
+   * Tests if a location is visible.
+   *
+   * @param location a given location
+   * @return true if the given location is within the visible map area
+   */
+  private boolean locationIsVisible(Location location) {
+    if (location == null || mapView == null) {
+      return false;
+    }
+    GeoPoint center = mapView.getMapCenter();
+    int latSpan = mapView.getLatitudeSpan();
+    int lonSpan = mapView.getLongitudeSpan();
+
+    // Bottom of map view is obscured by zoom controls/buttons.
+    // Subtract a margin from the visible area:
+    GeoPoint marginBottom = mapView.getProjection().fromPixels(
+        0, mapView.getHeight());
+    GeoPoint marginTop = mapView.getProjection().fromPixels(0,
+        mapView.getHeight()
+            - mapView.getZoomButtonsController().getZoomControls().getHeight());
+    int margin =
+        Math.abs(marginTop.getLatitudeE6() - marginBottom.getLatitudeE6());
+    GeoRect r = new GeoRect(center, latSpan, lonSpan);
+    r.top += margin;
+
+    GeoPoint geoPoint = LocationUtils.getGeoPoint(location);
+    return r.contains(geoPoint);
+  }
+
+  /**
+   * Moves the location pointer to the current location and center the map if
+   * the current location is outside the visible area.
+   */
+  private void showCurrentLocation() {
+    if (mapOverlay == null || mapView == null) {
+      return;
+    }
+
+    mapOverlay.setMyLocation(currentLocation);
+    mapView.postInvalidate();
+
+    if (currentLocation != null && keepMyLocationVisible && !locationIsVisible(currentLocation)) {
+      GeoPoint geoPoint = LocationUtils.getGeoPoint(currentLocation);
+      MapController controller = mapView.getController();
+      controller.animateTo(geoPoint);
+    }
+  }
+
+  @Override
+  public void onTrackUpdated(Track track) {
+    // We don't care.
+  }
+
+  /**
+   * Zooms and pans the map so that the given track is visible.
+   *
+   * @param track the track
+   */
+  private void zoomMapToBoundaries(Track track) {
+    if (mapView == null) {
+      return;
+    }
+
+    if (track == null || track.getNumberOfPoints() < 2) {
+      return;
+    }
+
+    TripStatistics stats = track.getStatistics();
+    int bottom = stats.getBottom();
+    int left = stats.getLeft();
+    int latSpanE6 = stats.getTop() - bottom;
+    int lonSpanE6 = stats.getRight() - left;
+    if (latSpanE6 > 0
+        && latSpanE6 < 180E6
+        && lonSpanE6 > 0
+        && lonSpanE6 < 360E6) {
+      keepMyLocationVisible = false;
+      GeoPoint center = new GeoPoint(
+          bottom + latSpanE6 / 2,
+          left + lonSpanE6 / 2);
+      if (LocationUtils.isValidGeoPoint(center)) {
+        mapView.getController().setCenter(center);
+        mapView.getController().zoomToSpan(latSpanE6, lonSpanE6);
+      }
+    }
+  }
+
+  /**
+   * Zooms and pans the map so that the given waypoint is visible.
+   */
+  public void showWaypoint(long waypointId) {
+    MyTracksProviderUtils providerUtils = MyTracksProviderUtils.Factory.get(this);
+    Waypoint wpt = providerUtils.getWaypoint(waypointId);
+    if (wpt != null && wpt.getLocation() != null) {
+      keepMyLocationVisible = false;
+      GeoPoint center = new GeoPoint(
+          (int) (wpt.getLocation().getLatitude() * 1E6),
+          (int) (wpt.getLocation().getLongitude() * 1E6));
+      mapView.getController().setCenter(center);
+      mapView.getController().setZoom(20);
+      mapView.invalidate();
+    }
+  }
+
+  @Override
+  public void onSelectedTrackChanged(final Track track, final boolean isRecording) {
+    runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        boolean trackSelected = track != null;
+        updateOptionsButton(trackSelected);
+
+        mapOverlay.setTrackDrawingEnabled(trackSelected);
+
+        if (trackSelected) {
+          busyPane.setVisibility(View.VISIBLE);
+  
+          zoomMapToBoundaries(track);
+  
+          mapOverlay.setShowEndMarker(!isRecording);
+          busyPane.setVisibility(View.GONE);
+        }
+        mapView.invalidate();
+      }
+    });
+  }
+
+  private final OnCreateContextMenuListener contextMenuListener =
+      new OnCreateContextMenuListener() {
+        @Override
+        public void onCreateContextMenu(ContextMenu menu, View v,
+            ContextMenuInfo menuInfo) {
+          menu.setHeaderTitle(R.string.tracklist_this_track);
+          menu.add(0, Constants.MENU_EDIT, 0,
+              R.string.tracklist_edit_track);
+          if (!dataHub.isRecordingSelected()) {
+            menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
+                R.string.tracklist_send_to_google);
+            SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
+                R.string.tracklist_share_track);
+            share.add(0, Constants.MENU_SHARE_LINK, 0,
+                R.string.tracklist_share_link);
+            share.add(0, Constants.MENU_SHARE_GPX_FILE, 0,
+                R.string.tracklist_share_gpx_file);
+            share.add(0, Constants.MENU_SHARE_KML_FILE, 0,
+                R.string.tracklist_share_kml_file);
+            share.add(0, Constants.MENU_SHARE_CSV_FILE, 0,
+                R.string.tracklist_share_csv_file);
+            share.add(0, Constants.MENU_SHARE_TCX_FILE, 0,
+                R.string.tracklist_share_tcx_file);
+            SubMenu save = menu.addSubMenu(0,
+                Constants.MENU_WRITE_TO_SD_CARD, 0,
+                R.string.tracklist_write_to_sd);
+            save.add(0, Constants.MENU_SAVE_GPX_FILE, 0,
+                R.string.tracklist_save_as_gpx);
+            save.add(0, Constants.MENU_SAVE_KML_FILE, 0,
+                R.string.tracklist_save_as_kml);
+            save.add(0, Constants.MENU_SAVE_CSV_FILE, 0,
+                R.string.tracklist_save_as_csv);
+            save.add(0, Constants.MENU_SAVE_TCX_FILE, 0,
+                R.string.tracklist_save_as_tcx);
+            menu.add(0, Constants.MENU_CLEAR_MAP, 0,
+                R.string.tracklist_clear_map);
+            menu.add(0, Constants.MENU_DELETE, 0,
+                R.string.tracklist_delete_track);
+          }
+        }
+      };
+
+  @Override
+  public boolean onMenuItemSelected(int featureId, MenuItem item) {
+    if (!super.onMenuItemSelected(featureId, item)) {
+      MyTracks.getInstance().onActivityResult(
+          Constants.getActionFromMenuId(item.getItemId()), RESULT_OK,
+          new Intent());
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    super.onCreateOptionsMenu(menu);
+    myLocation = menu.add(0, Constants.MENU_MY_LOCATION, 0,
+        R.string.mylocation);
+    myLocation.setIcon(android.R.drawable.ic_menu_mylocation);
+    toggleLayers = menu.add(0, Constants.MENU_TOGGLE_LAYERS, 0,
+        R.string.switch_to_sat);
+    toggleLayers.setIcon(android.R.drawable.ic_menu_mapmode);
+    return true;
+  }
+
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    toggleLayers.setTitle(mapView.isSatellite() ?
+        R.string.switch_to_map : R.string.switch_to_sat);
+    return super.onPrepareOptionsMenu(menu);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case Constants.MENU_MY_LOCATION: {
+        dataHub.forceUpdateLocation();
+        keepMyLocationVisible = true;
+        if (mapView.getZoomLevel() < 18) {
+          mapView.getController().setZoom(18);
+        }
+        return true;
+      }
+      case Constants.MENU_TOGGLE_LAYERS: {
+        mapView.setSatellite(!mapView.isSatellite());
+        return true;
+      }
+    }
+    return super.onOptionsItemSelected(item);
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (v == messagePane) {
+      startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS));
+    } else if (v == optionsBtn) {
+      optionsBtn.performLongClick();
+    }
+  }
+
+  /**
+   * We want the pointer to become visible again in case of the next location
+   * update:
+   */
+  @Override
+  public boolean onTouch(View view, MotionEvent event) {
+    if (keepMyLocationVisible && event.getAction() == MotionEvent.ACTION_MOVE) {
+      if (!locationIsVisible(currentLocation)) {
+        keepMyLocationVisible = false;
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public void onProviderStateChange(ProviderState state) {
+    final int messageId;
+    final boolean bindClick;
+    switch (state) {
+      case DISABLED:
+        messageId = R.string.status_enable_gps;
+        bindClick = true;
+        break;
+      case NO_FIX:
+      case BAD_FIX:
+        messageId = R.string.wait_for_fix;
+        bindClick = false;
+        break;
+      case GOOD_FIX:
+        // Nothing to show.
+        messageId = -1;
+        bindClick = false;
+        break;
+      default:
+        throw new IllegalArgumentException("Unexpected state: " + state);
+    }
+
+    runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        if (messageId != -1) {
+          messageText.setText(messageId);
+          messagePane.setVisibility(View.VISIBLE);
+
+          if (bindClick) {
+            messagePane.setOnClickListener(MapActivity.this);
+          } else {
+            messagePane.setOnClickListener(null);
+          }
+        } else {
+          messagePane.setVisibility(View.GONE);
+        }
+
+        screen.requestLayout();
+      }
+    });
+  }
+
+  @Override
+  public void onCurrentLocationChanged(Location location) {
+    currentLocation = location;
+    showCurrentLocation();
+  }
+
+  @Override
+  public void onCurrentHeadingChanged(double heading) {
+    synchronized (this) {
+      if (mapOverlay.setHeading((float) heading)) {
+        mapView.postInvalidate();
+      }
+    }
+  }
+
+  @Override
+  public void clearWaypoints() {
+    mapOverlay.clearWaypoints();
+  }
+
+  @Override
+  public void onNewWaypoint(Waypoint waypoint) {
+    if (LocationUtils.isValidLocation(waypoint.getLocation())) {
+      // TODO: Optimize locking inside addWaypoint
+      mapOverlay.addWaypoint(waypoint);
+    }
+  }
+
+  @Override
+  public void onNewWaypointsDone() {
+    mapView.postInvalidate();
+  }
+
+  @Override
+  public void clearTrackPoints() {
+    mapOverlay.clearPoints();
+  }
+
+  @Override
+  public void onNewTrackPoint(Location loc) {
+    mapOverlay.addLocation(loc);
+  }
+
+  @Override
+  public void onSegmentSplit() {
+    mapOverlay.addSegmentSplit();
+  }
+
+  @Override
+  public void onSampledOutTrackPoint(Location loc) {
+    // We don't care.
+  }
+
+  @Override
+  public void onNewTrackPointsDone() {
+    mapView.postInvalidate();
+  }
+
+  @Override
+  public boolean onUnitsChanged(boolean metric) {
+    // We don't care.
+    return false;
+  }
+
+  @Override
+  public boolean onReportSpeedChanged(boolean reportSpeed) {
+    // We don't care.
+    return false;
+  }
+}

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

@@ -16,7 +16,7 @@
 package com.google.android.apps.mytracks;
 
 import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.maps.GeoPoint;
 import com.google.android.maps.MapView;
 import com.google.android.maps.Overlay;
@@ -45,7 +45,7 @@ import java.util.concurrent.BlockingQueue;
  *
  * @author Leif Hendrik Wilden
  */
-public class MyTracksOverlay extends Overlay {
+public class MapOverlay extends Overlay {
 
   private final Drawable[] arrows;
   private final int arrowWidth, arrowHeight;
@@ -79,20 +79,31 @@ public class MyTracksOverlay extends Overlay {
   private static class CachedLocation {
     public final boolean valid;
     public final GeoPoint geoPoint;
-    
+
+    /**
+     * Constructor for an invalid cached location.
+     */
+    public CachedLocation() {
+      this.valid = false;
+      this.geoPoint = null;
+    }
+
+    /**
+     * Constructor for a potentially valid cached location.
+     */
     public CachedLocation(Location location) {
-      this.valid = MyTracksUtils.isValidLocation(location);
-      this.geoPoint = valid ? MyTracksUtils.getGeoPoint(location) : null; 
+      this.valid = LocationUtils.isValidLocation(location);
+      this.geoPoint = valid ? LocationUtils.getGeoPoint(location) : null; 
     }
   };
-  
-  public MyTracksOverlay(Context context) {
+
+  public MapOverlay(Context context) {
     this.context = context;
     
     this.waypoints = new ArrayList<Waypoint>();
     this.points = new ArrayList<CachedLocation>(1024);
     this.pendingPoints = new ArrayBlockingQueue<CachedLocation>(
-        MyTracksConstants.MAX_DISPLAYED_TRACK_POINTS, true);
+        Constants.MAX_DISPLAYED_TRACK_POINTS, true);
 
     // TODO: Can we use a FrameAnimation or similar here rather
     // than individual resources for each arrow direction?
@@ -164,6 +175,13 @@ public class MyTracksOverlay extends Overlay {
     pendingPoints.offer(new CachedLocation(l));
   }
 
+  /**
+   * Adds a segment split to the map overlay.
+   */
+  public void addSegmentSplit() {
+    pendingPoints.offer(new CachedLocation());
+  }
+
   public void addWaypoint(Waypoint wpt) {
     // Note: We don't cache waypoints, because it's not worth the effort.
     if (wpt != null && wpt.getLocation() != null) {
@@ -172,7 +190,7 @@ public class MyTracksOverlay extends Overlay {
       }
     }
   }
-  
+
   public int getNumLocations() {
     synchronized (points) {
       return points.size() + pendingPoints.size();
@@ -260,7 +278,7 @@ public class MyTracksOverlay extends Overlay {
     synchronized (waypoints) {;
       for (Waypoint wpt : waypoints) {
         Location loc = wpt.getLocation();
-        drawElement(canvas, projection, MyTracksUtils.getGeoPoint(loc),
+        drawElement(canvas, projection, LocationUtils.getGeoPoint(loc),
             wpt.getType() == Waypoint.TYPE_STATISTICS ? statsMarker
                 : waypointMarker, -(markerWidth / 2) + 3, -markerHeight);
       }
@@ -274,7 +292,7 @@ public class MyTracksOverlay extends Overlay {
     }
 
     Point pt = drawElement(canvas, projection,
-        MyTracksUtils.getGeoPoint(myLocation), arrows[lastHeading],
+        LocationUtils.getGeoPoint(myLocation), arrows[lastHeading],
         -(arrowWidth / 2) + 3, -(arrowHeight / 2));
     // Draw the error circle.
     float radius = projection.metersToEquatorPixels(myLocation.getAccuracy());
@@ -423,7 +441,7 @@ public class MyTracksOverlay extends Overlay {
       return false;
     }
 
-    final Location tapLocation = MyTracksUtils.getLocation(p);
+    final Location tapLocation = LocationUtils.getLocation(p);
     double dmin = Double.MAX_VALUE;
     Waypoint waypoint = null;
     synchronized (waypoints) {
@@ -442,8 +460,8 @@ public class MyTracksOverlay extends Overlay {
 
     if (waypoint != null &&
         dmin < 15000000 / Math.pow(2, mapView.getZoomLevel())) {
-      Intent intent = new Intent(context, MyTracksWaypointDetails.class);
-      intent.putExtra("waypointid", waypoint.getId());
+      Intent intent = new Intent(context, WaypointDetails.class);
+      intent.putExtra(WaypointDetails.WAYPOINT_ID_EXTRA, waypoint.getId());
       context.startActivity(intent);
       return true;
     }

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

@@ -64,21 +64,21 @@ class MenuManager {
         return true;
       }
       case R.id.menu_list_tracks: {
-	    activity.startActivityForResult(new Intent(activity, MyTracksList.class),
-	    		MyTracksConstants.SHOW_TRACK);
+	    activity.startActivityForResult(new Intent(activity, TrackList.class),
+	    		Constants.SHOW_TRACK);
         return true;
       }
       case R.id.menu_list_markers: {
-        Intent startIntent = new Intent(activity, MyTracksWaypointsList.class);
+        Intent startIntent = new Intent(activity, WaypointsList.class);
         startIntent.putExtra("trackid", activity.getSelectedTrackId());
-        activity.startActivityForResult(startIntent, MyTracksConstants.SHOW_WAYPOINT);
+        activity.startActivityForResult(startIntent, Constants.SHOW_WAYPOINT);
         return true;
       }
       case R.id.menu_sensor_state: {
         return startActivity(SensorStateActivity.class);
       }
       case R.id.menu_settings: {
-        return startActivity(MyTracksSettings.class);
+        return startActivity(SettingsActivity.class);
       }
       case R.id.menu_aggregated_stats: {
         return startActivity(AggregatedStatsActivity.class);
@@ -86,8 +86,8 @@ class MenuManager {
       case R.id.menu_help: {
         return startActivity(WelcomeActivity.class);
       }
-      case MyTracksConstants.MENU_CLEAR_MAP: {
-        activity.setSelectedTrackId(-1);
+      case Constants.MENU_CLEAR_MAP: {
+        activity.clearSelectedTrack();
         return true;
       }
     }

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

@@ -18,9 +18,8 @@ package com.google.android.apps.mytracks;
 import com.google.android.accounts.Account;
 import com.google.android.apps.mytracks.io.AuthManager;
 import com.google.android.apps.mytracks.io.AuthManagerFactory;
-import com.google.android.apps.mytracks.io.MyMapsFactory;
 import com.google.android.apps.mytracks.io.mymaps.MapsFacade;
-import com.google.android.apps.mytracks.io.mymaps.MapsService;
+import com.google.android.apps.mytracks.io.mymaps.MyMapsConstants;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -84,7 +83,7 @@ public class MyMapsList extends Activity implements MapsFacade.MapsListCallback
     super.onCreate(icicle);
 
     auth = AuthManagerFactory.getAuthManager(this, GET_LOGIN, null, true,
-        MapsService.getServiceName());
+        MyMapsConstants.SERVICE_NAME);
 
     setContentView(R.layout.list);
 
@@ -125,7 +124,7 @@ public class MyMapsList extends Activity implements MapsFacade.MapsListCallback
     auth.doLogin(new Runnable() {
       public void run() {
         // Runs in UI thread.
-        mapsClient = MyMapsFactory.newMapsClient(MyMapsList.this, auth);
+        mapsClient = new MapsFacade(MyMapsList.this, auth);
 
         startLookup();
       }
@@ -200,7 +199,7 @@ public class MyMapsList extends Activity implements MapsFacade.MapsListCallback
         shareIntent.putExtra(Intent.EXTRA_TEXT, String.format(
             getText(R.string.share_map_body_format).toString(),
             listItem[1],
-            MapsService.buildMapUrl(listItem[0])));
+            MapsFacade.buildMapUrl(listItem[0])));
         startActivity(Intent.createChooser(shareIntent,
             getText(R.string.share_map).toString()));
         return true;

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

@@ -15,37 +15,39 @@
  */
 package com.google.android.apps.mytracks;
 
+import static com.google.android.apps.mytracks.Constants.TAG;
 import static com.google.android.apps.mytracks.DialogManager.DIALOG_IMPORT_PROGRESS;
 import static com.google.android.apps.mytracks.DialogManager.DIALOG_PROGRESS;
 import static com.google.android.apps.mytracks.DialogManager.DIALOG_SEND_TO_GOOGLE;
-import static com.google.android.apps.mytracks.DialogManager.DIALOG_WRITE_PROGRESS;
 
 import com.google.android.accounts.Account;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
+import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 import com.google.android.apps.mytracks.io.AuthManager;
 import com.google.android.apps.mytracks.io.AuthManagerFactory;
-import com.google.android.apps.mytracks.io.GpxImporter;
 import com.google.android.apps.mytracks.io.SendToDocs;
 import com.google.android.apps.mytracks.io.SendToFusionTables;
 import com.google.android.apps.mytracks.io.SendToFusionTables.OnSendCompletedListener;
 import com.google.android.apps.mytracks.io.SendToMyMaps;
-import com.google.android.apps.mytracks.io.TempFileCleaner;
-import com.google.android.apps.mytracks.io.TrackWriter;
-import com.google.android.apps.mytracks.io.TrackWriterFactory;
-import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat;
-import com.google.android.apps.mytracks.io.mymaps.MapsService;
+import com.google.android.apps.mytracks.io.file.GpxImporter;
+import com.google.android.apps.mytracks.io.file.TempFileCleaner;
+import com.google.android.apps.mytracks.io.file.TrackWriter;
+import com.google.android.apps.mytracks.io.file.TrackWriterFactory;
+import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
+import com.google.android.apps.mytracks.io.mymaps.MapsFacade;
+import com.google.android.apps.mytracks.io.mymaps.MyMapsConstants;
 import com.google.android.apps.mytracks.io.sendtogoogle.ResultDialogFactory;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendDialog;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendResult;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendType;
 import com.google.android.apps.mytracks.services.ITrackRecordingService;
-import com.google.android.apps.mytracks.services.StatusAnnouncerFactory;
 import com.google.android.apps.mytracks.services.TrackRecordingService;
+import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerFactory;
 import com.google.android.apps.mytracks.util.ApiFeatures;
 import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -53,15 +55,11 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.TabActivity;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.res.Resources;
-import android.location.Location;
-import android.location.LocationManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -99,12 +97,13 @@ import org.xml.sax.SAXException;
  * @author Leif Hendrik Wilden
  */
 public class MyTracks extends TabActivity implements OnTouchListener,
-    OnSharedPreferenceChangeListener, ProgressIndicator {
+    ProgressIndicator {
   /**
    * Singleton instance
    */
   private static MyTracks instance;
 
+  private TrackDataHub dataHub;
   private ChartActivity chartActivity;
 
   /*
@@ -148,16 +147,6 @@ public class MyTracks extends TabActivity implements OnTouchListener,
 
   private ITrackRecordingService trackRecordingService;
 
-  /**
-   * The id of the currently recording track.
-   */
-  private long recordingTrackId = -1;
-
-  /**
-   * The id of the currently selected track.
-   */
-  private long selectedTrackId = -1;
-
   /**
    * Does the user want to share the current track.
    */
@@ -176,7 +165,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   private final ServiceConnection serviceConnection = new ServiceConnection() {
     @Override
     public void onServiceConnected(ComponentName className, IBinder service) {
-      Log.d(MyTracksConstants.TAG, "MyTracks: Service now connected.");
+      Log.d(Constants.TAG, "MyTracks: Service now connected.");
       // Delay setting the service until we are done with initialization.
       ITrackRecordingService trackRecordingService =
           ITrackRecordingService.Stub.asInterface(service);
@@ -194,7 +183,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
 
     @Override
     public void onServiceDisconnected(ComponentName className) {
-      Log.d(MyTracksConstants.TAG, "MyTracks: Service now disconnected.");
+      Log.d(TAG, "MyTracks: Service now disconnected.");
       trackRecordingService = null;
     }
   };
@@ -232,26 +221,20 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   public boolean isRecording() {
     if (trackRecordingService == null) {
       // Fall back to alternative check method.
-      return isRecordingBasedOnSharedPreferences();
+      return dataHub.isRecording();
     }
     try {
       return trackRecordingService.isRecording();
       // TODO: We catch Exception, because after eliminating the service process
       // all exceptions it may throw are no longer wrapped in a RemoteException.
     } catch (Exception e) {
-      Log.e(MyTracksConstants.TAG, "MyTracks: Remote exception.", e);
+      Log.e(TAG, "MyTracks: Remote exception.", e);
 
       // Fall back to alternative check method.
-      return isRecordingBasedOnSharedPreferences();
+      return dataHub.isRecording();
     }
   }
 
-  private boolean isRecordingBasedOnSharedPreferences() {
-    // TrackRecordingService guarantees that recordingTrackId is set to
-    // -1 if the track has been stopped.
-    return recordingTrackId >= 0;
-  }
-
   /*
    * Application lifetime events:
    * ============================
@@ -259,17 +242,18 @@ public class MyTracks extends TabActivity implements OnTouchListener,
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    Log.d(MyTracksConstants.TAG, "MyTracks.onCreate");
+    Log.d(TAG, "MyTracks.onCreate");
     super.onCreate(savedInstanceState);
     instance = this;
     ApiFeatures apiFeatures = ApiFeatures.getInstance();
-    if (!MyTracksUtils.isRelease(this)) {
+    if (!SystemUtils.isRelease(this)) {
       apiFeatures.getApiPlatformAdapter().enableStrictMode();
     }
 
     providerUtils = MyTracksProviderUtils.Factory.get(this);
+    sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, 0);
+    dataHub = new TrackDataHub(this, sharedPreferences, providerUtils);
     menuManager = new MenuManager(this);
-    sharedPreferences = getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
     dialogManager = new DialogManager(this);
 
     // The volume we want to control is the Text-To-Speech volume
@@ -285,7 +269,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     tabHost.addTab(tabHost.newTabSpec("tab1")
         .setIndicator("Map", res.getDrawable(
             android.R.drawable.ic_menu_mapmode))
-        .setContent(new Intent(this, MyTracksMap.class)));
+        .setContent(new Intent(this, MapActivity.class)));
     tabHost.addTab(tabHost.newTabSpec("tab2")
         .setIndicator("Stats", res.getDrawable(R.drawable.menu_stats))
         .setContent(new Intent(this, StatsActivity.class)));
@@ -310,20 +294,6 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     tabHost.addView(layout);
     layout.setOnTouchListener(this);
 
-    if (sharedPreferences != null) {
-      selectedTrackId =
-          sharedPreferences.getLong(getString(R.string.selected_track_key), -1);
-      recordingTrackId = sharedPreferences.getLong(
-          getString(R.string.recording_track_key), -1);
-      sharedPreferences.registerOnSharedPreferenceChangeListener(this);
-      Log.d(MyTracksConstants.TAG, "recordingTrackId: " + recordingTrackId
-          + ", selectedTrackId: " + selectedTrackId);
-      if (recordingTrackId > 0) {
-        Intent startIntent = new Intent(this, TrackRecordingService.class);
-        startService(startIntent);
-      }
-    }
-
     // This will show the eula until the user accepts or quits the app.
     Eula.showEulaRequireAcceptance(this);
 
@@ -335,35 +305,45 @@ public class MyTracks extends TabActivity implements OnTouchListener,
         // Do nothing.
       } else if (action.equals(Intent.ACTION_VIEW)) {
         if (intent.getScheme() != null && intent.getScheme().equals("file")) {
-          Log.w(MyTracksConstants.TAG,
-              "Received a VIEW intent with file scheme. Importing.");
+          Log.w(TAG, "Received a VIEW intent with file scheme. Importing.");
           importGpxFile(intent.getData().getPath());
         } else {
-          Log.w(MyTracksConstants.TAG,
-              "Received a VIEW intent with unsupported scheme "
-              + intent.getScheme());
+          Log.w(TAG, "Received a VIEW intent with unsupported scheme " + intent.getScheme());
         }
       } else {
-        Log.w(MyTracksConstants.TAG,
-            "Received an intent with unsupported action " + action);
+        Log.w(TAG, "Received an intent with unsupported action " + action);
       }
     } else {
-      Log.d(MyTracksConstants.TAG, "Received an intent with no action.");
+      Log.d(TAG, "Received an intent with no action.");
     }
   }
 
   @Override
   protected void onDestroy() {
-    Log.d(MyTracksConstants.TAG, "MyTracks.onDestroy");
+    Log.d(TAG, "MyTracks.onDestroy");
+
+    dataHub.destroy();
+
     tryUnbindTrackRecordingService();
     super.onDestroy();
   }
 
+  @Override
+  protected void onStop() {
+    Log.d(TAG, "MyTracks.onStop");
+
+    dataHub.stop();
+
+    // Clean up any temporary track files.
+    TempFileCleaner.clean();
+    super.onStop();
+  }
+
   @Override
   protected void onPause() {
     // Called when activity is going into the background, but has not (yet) been
     // killed. Shouldn't block longer than approx. 2 seconds.
-    Log.d(MyTracksConstants.TAG, "MyTracks.onPause");
+    Log.d(TAG, "MyTracks.onPause");
     tryUnbindTrackRecordingService();
     super.onPause();
   }
@@ -372,17 +352,22 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   protected void onResume() {
     // Called when the current activity is being displayed or re-displayed
     // to the user.
-    Log.d(MyTracksConstants.TAG, "MyTracks.onResume");
+    Log.d(TAG, "MyTracks.onResume");
     tryBindTrackRecordingService();
     super.onResume();
   }
 
   @Override
-  protected void onStop() {
-    Log.d(MyTracksConstants.TAG, "MyTracks.onStop");
-    // Clean up any temporary track files.
-    TempFileCleaner.clean();
-    super.onStop();
+  protected void onStart() {
+    Log.d(TAG, "MyTracks.onStart");
+    super.onStart();
+    dataHub.start();
+
+    // Ensure that service is running if we're supposed to be recording
+    if (dataHub.isRecording()) {
+      Intent startIntent = new Intent(this, TrackRecordingService.class);
+      startService(startIntent);
+    }
   }
 
   /*
@@ -399,7 +384,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
     menuManager.onPrepareOptionsMenu(menu, providerUtils.getLastTrack() != null,
-        isRecording(), selectedTrackId >= 0);
+        isRecording(), dataHub.isATrackSelected());
     return super.onPrepareOptionsMenu(menu);
   }
 
@@ -443,9 +428,9 @@ public class MyTracks extends TabActivity implements OnTouchListener,
         try {
           insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS);
         } catch (RemoteException e) {
-          Log.e(MyTracksConstants.TAG, "Cannot insert statistics marker.", e);
+          Log.e(TAG, "Cannot insert statistics marker.", e);
         } catch (IllegalStateException e) {
-          Log.e(MyTracksConstants.TAG, "Cannot insert statistics marker.", e);
+          Log.e(TAG, "Cannot insert statistics marker.", e);
         }
         return true;
       }
@@ -456,34 +441,40 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   @Override
   public void onActivityResult(int requestCode, int resultCode,
       final Intent results) {
+    Log.d(TAG, "MyTracks.onActivityResult");
     TrackFileFormat exportFormat = null;
+    long trackId = dataHub.getSelectedTrackId();
+    if (results != null) {
+      trackId = results.getLongExtra("trackid", trackId);
+    }
+
     switch (requestCode) {
-      case MyTracksConstants.GET_LOGIN: {
+      case Constants.GET_LOGIN: {
         if (resultCode != RESULT_OK || auth == null || !auth.authResult(resultCode, results)) {
           dialogManager.dismissDialogSafely(DIALOG_PROGRESS);
         }
         break;
       }
-      case MyTracksConstants.SHOW_TRACK: {
+      case Constants.SHOW_TRACK: {
         if (results != null) {
-          final long trackId = results.getLongExtra("trackid", -1);
           if (trackId >= 0) {
-            setSelectedTrackId(trackId);
+            dataHub.loadTrack(trackId);
+
             // The track list passed the requested action as result code. Hand
             // it off to the onAcitivtyResult for further processing:
-            if (resultCode != MyTracksConstants.SHOW_TRACK) {
+            if (resultCode != Constants.SHOW_TRACK) {
               onActivityResult(resultCode, Activity.RESULT_OK, results);
             }
           }
         }
         break;
       }
-      case MyTracksConstants.SHOW_WAYPOINT: {
+      case Constants.SHOW_WAYPOINT: {
         if (results != null) {
           final long waypointId = results.getLongExtra("waypointid", -1);
           if (waypointId >= 0) {
-            MyTracksMap map =
-                (MyTracksMap) getLocalActivityManager().getActivity("tab1");
+            MapActivity map =
+                (MapActivity) getLocalActivityManager().getActivity("tab1");
             if (map != null) {
               getTabHost().setCurrentTab(0);
               map.showWaypoint(waypointId);
@@ -492,31 +483,29 @@ public class MyTracks extends TabActivity implements OnTouchListener,
         }
         break;
       }
-      case MyTracksConstants.DELETE_TRACK: {
+      case Constants.DELETE_TRACK: {
         if (results != null && resultCode == RESULT_OK) {
-          final long trackId = results.getLongExtra("trackid", selectedTrackId);
           deleteTrack(trackId);
         }
         break;
       }
-      case MyTracksConstants.EDIT_DETAILS: {
+      case Constants.EDIT_DETAILS: {
         if (results != null && resultCode == RESULT_OK) {
-          final long trackId = results.getLongExtra("trackid", selectedTrackId);
-          Intent intent = new Intent(this, MyTracksDetails.class);
+          Intent intent = new Intent(this, TrackDetails.class);
           intent.putExtra("trackid", trackId);
           startActivity(intent);
         }
         break;
       }
-      case MyTracksConstants.SEND_TO_GOOGLE_DIALOG: {
+      case Constants.SEND_TO_GOOGLE_DIALOG: {
         shareRequested = false;
         dialogManager.showDialogSafely(DIALOG_SEND_TO_GOOGLE);
         break;
       }
-      case MyTracksConstants.GET_MAP: {
+      case Constants.GET_MAP: {
         // User picked a map to upload to
         if (resultCode == RESULT_OK) {
-          results.putExtra("trackid", selectedTrackId);
+          results.putExtra("trackid", dataHub.getSelectedTrackId());
           if (results.hasExtra("mapid")) {
             sendToMyMapsMapId = results.getStringExtra("mapid");
           }
@@ -526,21 +515,15 @@ public class MyTracks extends TabActivity implements OnTouchListener,
         }
         break;
       }
-      case MyTracksConstants.AUTHENTICATE_TO_MY_MAPS: {
+      case Constants.AUTHENTICATE_TO_MY_MAPS: {
         // Authenticated with Google My Maps
         if (results != null && resultCode == RESULT_OK) {
           final String mapId;
-          final long trackId;
           if (results.hasExtra("mapid")) {
             mapId = results.getStringExtra("mapid");
           } else {
             mapId = "new";
           }
-          if (results.hasExtra("trackid")) {
-            trackId = results.getLongExtra("trackid", -1);
-          } else {
-            trackId = selectedTrackId;
-          }
 
           sendToGoogleMaps(trackId, mapId);
         } else {
@@ -548,23 +531,16 @@ public class MyTracks extends TabActivity implements OnTouchListener,
         }
         break;
       }
-      case MyTracksConstants.AUTHENTICATE_TO_FUSION_TABLES: {
+      case Constants.AUTHENTICATE_TO_FUSION_TABLES: {
         // Authenticated with Google Fusion Tables
         if (results != null && resultCode == RESULT_OK) {
-          final long trackId;
-          if (results.hasExtra("trackid")) {
-            trackId = results.getLongExtra("trackid", -1);
-          } else {
-            trackId = selectedTrackId;
-          }
-
           sendToFusionTables(trackId);
         } else {
           onSendToGoogleDone();
         }
         break;
       }
-      case MyTracksConstants.AUTHENTICATE_TO_DOCLIST: {
+      case Constants.AUTHENTICATE_TO_DOCLIST: {
         // Authenticated with Google Docs
         if (resultCode == RESULT_OK) {
           authenticateToGoogleTrix();
@@ -573,42 +549,40 @@ public class MyTracks extends TabActivity implements OnTouchListener,
         }
         break;
       }
-      case MyTracksConstants.AUTHENTICATE_TO_TRIX: {
+      case Constants.AUTHENTICATE_TO_TRIX: {
         // Authenticated with Trix
         if (resultCode == RESULT_OK) {
-          final long trackId = results.getLongExtra("trackid", selectedTrackId);
           sendToGoogleDocs(trackId);
         } else {
           onSendToGoogleDone();
         }
         break;
       }
-      case MyTracksConstants.SAVE_GPX_FILE:
+      case Constants.SAVE_GPX_FILE:
         if (exportFormat == null) { exportFormat = TrackFileFormat.GPX; }
         //$FALL-THROUGH$
-      case MyTracksConstants.SAVE_KML_FILE:
+      case Constants.SAVE_KML_FILE:
         if (exportFormat == null) { exportFormat = TrackFileFormat.KML; }
         //$FALL-THROUGH$
-      case MyTracksConstants.SAVE_CSV_FILE:
+      case Constants.SAVE_CSV_FILE:
         if (exportFormat == null) { exportFormat = TrackFileFormat.CSV; }
         //$FALL-THROUGH$
-      case MyTracksConstants.SAVE_TCX_FILE:
+      case Constants.SAVE_TCX_FILE:
         if (exportFormat == null) { exportFormat = TrackFileFormat.TCX; }
 
         if (results != null && resultCode == Activity.RESULT_OK) {
-          final long trackId = results.getLongExtra("trackid", selectedTrackId);
           if (trackId >= 0) {
             saveTrack(trackId, exportFormat);
           }
         }
         break;
-      case MyTracksConstants.SHARE_LINK: {
-        Track selectedTrack = providerUtils.getTrack(selectedTrackId);
+      case Constants.SHARE_LINK: {
+        Track selectedTrack = providerUtils.getTrack(dataHub.getSelectedTrackId());
         if (selectedTrack != null) {
           if (!TextUtils.isEmpty(selectedTrack.getMapId())) {
-            shareLinkToMap(MapsService.buildMapUrl(selectedTrack.getMapId()));
+            shareLinkToMap(MapsFacade.buildMapUrl(selectedTrack.getMapId()));
           } else if (!TextUtils.isEmpty(selectedTrack.getTableId())) {
-            shareLinkToMap(getFusionTablesUrl(selectedTrackId));
+            shareLinkToMap(getFusionTablesUrl(dataHub.getSelectedTrackId()));
           } else {
             shareRequested = true;
             dialogManager.showDialogSafely(DIALOG_SEND_TO_GOOGLE);
@@ -616,38 +590,36 @@ public class MyTracks extends TabActivity implements OnTouchListener,
         }
         break;
       }
-      case MyTracksConstants.SHARE_GPX_FILE:
+      case Constants.SHARE_GPX_FILE:
         if (exportFormat == null) { exportFormat = TrackFileFormat.GPX; }
         //$FALL-THROUGH$
-      case MyTracksConstants.SHARE_KML_FILE:
+      case Constants.SHARE_KML_FILE:
         if (exportFormat == null) { exportFormat = TrackFileFormat.KML; }
         //$FALL-THROUGH$
-      case MyTracksConstants.SHARE_CSV_FILE:
+      case Constants.SHARE_CSV_FILE:
         if (exportFormat == null) { exportFormat = TrackFileFormat.CSV; }
         //$FALL-THROUGH$
-      case MyTracksConstants.SHARE_TCX_FILE: {
+      case Constants.SHARE_TCX_FILE: {
         if (exportFormat == null) { exportFormat = TrackFileFormat.TCX; }
 
         if (results != null && resultCode == Activity.RESULT_OK) {
-          final long trackId = results.getLongExtra("trackid", selectedTrackId);
           if (trackId >= 0) {
             sendTrack(trackId, exportFormat);
           }
         }
         break;
       }
-      case MyTracksConstants.CLEAR_MAP: {
-        setSelectedTrackId(-1);
+      case Constants.CLEAR_MAP: {
+        dataHub.unloadCurrentTrack();
         break;
       }
-      case MyTracksConstants.WELCOME: {
+      case Constants.WELCOME: {
         CheckUnits.check(this);
         break;
       }
 
       default: {
-        Log.w(MyTracksConstants.TAG,
-            "Warning unhandled request code: " + requestCode);
+        Log.w(TAG, "Warning unhandled request code: " + requestCode);
       }
     }
   }
@@ -660,19 +632,6 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     return false;
   }
 
-  @Override
-  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
-      String key) {
-    if (key != null && key.equals(getString(R.string.selected_track_key))) {
-      selectedTrackId = sharedPreferences.getLong(
-          getString(R.string.selected_track_key), -1);
-    }
-    if (key != null && key.equals(getString(R.string.recording_track_key))) {
-      recordingTrackId = sharedPreferences.getLong(
-          getString(R.string.recording_track_key), -1);
-    }
-  }
-
   /**
    * Resets status information for sending to MyMaps/Docs.
    */
@@ -701,24 +660,24 @@ public class MyTracks extends TabActivity implements OnTouchListener,
             InputStream is = new FileInputStream(fileName);
             trackIdsImported = GpxImporter.importGPXFile(is, providerUtils);
           } catch (SAXException e) {
-            Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e);
+            Log.e(TAG, "Caught an unexpected exception.", e);
             message = R.string.error_generic;
           } catch (ParserConfigurationException e) {
-            Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e);
+            Log.e(TAG, "Caught an unexpected exception.", e);
             message = R.string.error_generic;
           } catch (IOException e) {
-            Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e);
+            Log.e(TAG, "Caught an unexpected exception.", e);
             message = R.string.error_unable_to_read_file;
           } catch (NullPointerException e) {
-            Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e);
+            Log.e(TAG, "Caught an unexpected exception.", e);
             message = R.string.error_invalid_gpx_format;
           } catch (OutOfMemoryError e) {
-            Log.e(MyTracksConstants.TAG, "Caught an unexpected exception.", e);
+            Log.e(TAG, "Caught an unexpected exception.", e);
             message = R.string.error_out_of_memory;
           }
           if (trackIdsImported != null && trackIdsImported.length > 0) {
             // select last track from import file
-            setSelectedTrackId(trackIdsImported[trackIdsImported.length - 1]);
+            dataHub.loadTrack(trackIdsImported[trackIdsImported.length - 1]);
           } else {
             dialogManager.showMessageDialog(message, false/* success */);
           }
@@ -790,8 +749,8 @@ public class MyTracks extends TabActivity implements OnTouchListener,
       public void onClick(DialogInterface dialog, int i) {
         dialog.dismiss();
         providerUtils.deleteTrack(trackId);
-        if (trackId == selectedTrackId) {
-          setSelectedTrackId(-1);
+        if (trackId == dataHub.getSelectedTrackId()) {
+          dataHub.unloadCurrentTrack();
         }
       }});
     builder.setNegativeButton(getString(R.string.no),
@@ -804,46 +763,6 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     dialog.show();
   }
 
-  public Location getCurrentLocation() {
-    // TODO: Let's look at more advanced algorithms to determine the best
-    // current location.
-    LocationManager locationManager =
-        (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-    if (locationManager == null) {
-      return null;
-    }
-    final long maxAgeMilliSeconds = 1000 * 60 * 1;  // 1 minute
-    final long maxAgeNetworkMilliSeconds = 1000 * 60 * 10;  // 10 minutes
-    final long now = System.currentTimeMillis();
-    Location loc = locationManager.getLastKnownLocation(
-        MyTracksConstants.GPS_PROVIDER);
-    if (loc == null || loc.getTime() < now - maxAgeMilliSeconds) {
-      // We don't have a recent GPS fix, just use cell towers if available
-      loc = locationManager.getLastKnownLocation(
-          LocationManager.NETWORK_PROVIDER);
-      if (loc == null || loc.getTime() < now - maxAgeNetworkMilliSeconds) {
-        // We don't have a recent cell tower location, let the user know:
-        Toast.makeText(this, getString(R.string.status_no_location),
-            Toast.LENGTH_LONG).show();
-        return null;
-      } else {
-       // Let the user know we have only an approximate location:
-       Toast.makeText(this, getString(R.string.status_approximate_location),
-           Toast.LENGTH_LONG).show();
-      }
-    }
-    return loc;
-  }
-
-  public Location getLastLocation() {
-    if (providerUtils.getLastLocationId(recordingTrackId) < 0) {
-      return null;
-    }
-    LocationManager locationManager =
-        (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-    return locationManager.getLastKnownLocation(MyTracksConstants.GPS_PROVIDER);
-  }
-
   /**
    * Inserts a waypoint marker.
    *
@@ -876,16 +795,15 @@ public class MyTracks extends TabActivity implements OnTouchListener,
       final String service) {
     auth = authMap.get(service);
     if (auth == null) {
-      Log.i(MyTracksConstants.TAG,
-          "Creating a new authentication for service: " + service);
+      Log.i(TAG, "Creating a new authentication for service: " + service);
       auth = AuthManagerFactory.getAuthManager(this,
-          MyTracksConstants.GET_LOGIN,
+          Constants.GET_LOGIN,
           null,
           true,
           service);
       authMap.put(service, auth);
     }
-    Log.d(MyTracksConstants.TAG, "Logging in to " + service + "...");
+    Log.d(TAG, "Logging in to " + service + "...");
     if (AuthManagerFactory.useModernAuthManager()) {
       runOnUiThread(new Runnable() {
         @Override
@@ -912,7 +830,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
       final String service, final Account account) {
     auth.doLogin(new Runnable() {
       public void run() {
-        Log.d(MyTracksConstants.TAG, "Loggin success for " + service + "!");
+        Log.d(TAG, "Loggin success for " + service + "!");
         onActivityResult(requestCode, RESULT_OK, results);
       }
     }, account);
@@ -921,9 +839,9 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   private void startRecordingNewTrack(
       ITrackRecordingService trackRecordingService) {
     try {
-      recordingTrackId = trackRecordingService.startNewTrack();
+      long recordingTrackId = trackRecordingService.startNewTrack();
       // Select the recording track.
-      setSelectedTrackId(recordingTrackId);
+      dataHub.loadTrack(recordingTrackId);
       Toast.makeText(this, getString(R.string.status_now_recording),
           Toast.LENGTH_SHORT).show();
       // TODO: We catch Exception, because after eliminating the service process
@@ -932,7 +850,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
       Toast.makeText(this,
           getString(R.string.error_unable_to_start_recording),
           Toast.LENGTH_SHORT).show();
-      Log.w(MyTracksConstants.TAG, "Unable to start recording.", e);
+      Log.w(TAG, "Unable to start recording.", e);
     }
   }
 
@@ -958,25 +876,27 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   public void stopRecording() {
     if (trackRecordingService != null) {
       // Save the track id as the shared preference will overwrite the recording track id.
-      long currentTrackId = recordingTrackId;
+      long currentTrackId = sharedPreferences.getLong(getString(R.string.recording_track_key), -1);
       try {
         trackRecordingService.endCurrentTrack();
         // TODO: We catch Exception, because after eliminating the service process
         // all exceptions it may throw are no longer wrapped in a RemoteException.
       } catch (Exception e) {
-        Log.e(MyTracksConstants.TAG, "Unable to stop recording.", e);
+        Log.e(TAG, "Unable to stop recording.", e);
+      }
+
+      if (currentTrackId > 0) {
+        Intent intent = new Intent(MyTracks.this, TrackDetails.class);
+        intent.putExtra("trackid", currentTrackId);
+        intent.putExtra("hasCancelButton", false);
+        startActivity(intent);
       }
-      Intent intent = new Intent(MyTracks.this, MyTracksDetails.class);
-      intent.putExtra("trackid", currentTrackId);
-      intent.putExtra("hasCancelButton", false);
-      startActivity(intent);
     }
     tryUnbindTrackRecordingService();
     try {
       stopService(new Intent(MyTracks.this, TrackRecordingService.class));
     } catch (SecurityException e) {
-      Log.e(MyTracksConstants.TAG,
-          "Encountered a security exception when trying to stop service.", e);
+      Log.e(TAG, "Encountered a security exception when trying to stop service.", e);
     }
     trackRecordingService = null;
   }
@@ -985,7 +905,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
    * Initiates the process to send tracks to google.
    * This is called once the user has selected sending options via the
    * SendToGoogleDialog.
-   *
+   * 
    * TODO: Change this whole flow to an actual state machine.
    */
   public void sendToGoogle() {
@@ -1005,7 +925,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     } else if (sendToGoogleDialog.getSendToDocs()) {
       authenticateToGoogleDocs();
     } else  {
-      Log.w(MyTracksConstants.TAG, "Nowhere to upload to");
+      Log.w(TAG, "Nowhere to upload to");
       onSendToGoogleDone();
     }
   }
@@ -1014,7 +934,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     if (!sendToGoogleDialog.getCreateNewMap()) {
       // Ask the user to choose a map to upload into
       Intent listIntent = new Intent(this, MyMapsList.class);
-      startActivityForResult(listIntent, MyTracksConstants.GET_MAP);
+      startActivityForResult(listIntent, Constants.GET_MAP);
       // The callback for GET_MAP calls authenticateToGoogleMaps
     } else {
       authenticateToGoogleMaps(null);
@@ -1027,8 +947,8 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     setProgressValue(0);
     setProgressMessage(
         R.string.progress_message_authenticating_mymaps);
-    authenticate(results, MyTracksConstants.AUTHENTICATE_TO_MY_MAPS,
-        MapsService.getServiceName());
+    authenticate(results, Constants.AUTHENTICATE_TO_MY_MAPS,
+        MyMapsConstants.SERVICE_NAME);
     // AUTHENTICATE_TO_MY_MAPS callback calls sendToGoogleMaps
   }
 
@@ -1048,7 +968,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
           } catch (RuntimeException e) {
             // If that fails whatever reasons we'll just log an error, but
             // continue.
-            Log.w(MyTracksConstants.TAG, "Updating map id failed.", e);
+            Log.w(TAG, "Updating map id failed.", e);
           }
         }
 
@@ -1080,7 +1000,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
 
     setProgressValue(0);
     setProgressMessage(R.string.progress_message_authenticating_fusiontables);
-    authenticate(results, MyTracksConstants.AUTHENTICATE_TO_FUSION_TABLES,
+    authenticate(results, Constants.AUTHENTICATE_TO_FUSION_TABLES,
         SendToFusionTables.SERVICE_ID);
     // AUTHENTICATE_TO_FUSION_TABLES callback calls sendToFusionTables
   }
@@ -1102,10 +1022,10 @@ public class MyTracks extends TabActivity implements OnTouchListener,
           } catch (RuntimeException e) {
             // If that fails whatever reasons we'll just log an error, but
             // continue.
-            Log.w(MyTracksConstants.TAG, "Updating table id failed.", e);
+            Log.w(TAG, "Updating table id failed.", e);
           }
         }
-
+        
         onSendToFusionTablesDone();
       }
     };
@@ -1133,7 +1053,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     setProgressMessage(
         R.string.progress_message_authenticating_docs);
     authenticate(new Intent(),
-        MyTracksConstants.AUTHENTICATE_TO_DOCLIST,
+        Constants.AUTHENTICATE_TO_DOCLIST,
         SendToDocs.GDATA_SERVICE_NAME_DOCLIST);
     // AUTHENTICATE_TO_DOCLIST callback calls authenticateToGoogleTrix
   }
@@ -1143,16 +1063,16 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     setProgressMessage(
         R.string.progress_message_authenticating_docs);
     authenticate(new Intent(),
-        MyTracksConstants.AUTHENTICATE_TO_TRIX,
+        Constants.AUTHENTICATE_TO_TRIX,
         SendToDocs.GDATA_SERVICE_NAME_TRIX);
     // AUTHENTICATE_TO_TRIX callback calls sendToGoogleDocs
   }
 
   private void sendToGoogleDocs(final long trackId) {
-    Log.d(MyTracksConstants.TAG, "Sending to Docs....");
+    Log.d(TAG, "Sending to Docs....");
     setProgressValue(50);
     setProgressMessage(R.string.progress_message_sending_docs);
-    final SendToDocs sender = new SendToDocs(this,
+    final SendToDocs sender = new SendToDocs(this, 
         authMap.get(SendToDocs.GDATA_SERVICE_NAME_TRIX),
         authMap.get(SendToDocs.GDATA_SERVICE_NAME_DOCLIST), trackId);
     sendToTrackId = trackId;
@@ -1221,11 +1141,11 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     DialogManager.showDialogSafely(this, sendToGoogleResultDialog);
   }
 
-  private boolean shareLinkToMap(boolean sentToMyMaps, boolean sentToFusionTables) {
+  boolean shareLinkToMap(boolean sentToMyMaps, boolean sentToFusionTables) {
     String url = null;
     if (sentToMyMaps && sendToMyMapsSuccess) {
       // Prefer a link to My Maps
-      url = MapsService.buildMapUrl(sendToMyMapsMapId);
+      url = MapsFacade.buildMapUrl(sendToMyMapsMapId);
     } else if (sentToFusionTables && sendToFusionTablesSuccess) {
       // Otherwise try using the link to fusion tables
       url = getFusionTablesUrl(sendToTrackId);
@@ -1239,9 +1159,9 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     return false;
   }
 
-  protected String getFusionTablesUrl(long sendToTrackId2) {
-    Track track = providerUtils.getTrack(sendToTrackId);
-    return SendToFusionTables.getMapVisualizationUrl(track);
+  protected String getFusionTablesUrl(long trackId) {
+    Track track = providerUtils.getTrack(trackId);
+    return track == null ? "" : SendToFusionTables.getMapVisualizationUrl(track);
   }
 
   /**
@@ -1264,32 +1184,23 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     return results;
   }
 
-  /**
-   * Writes the selected track id to the shared preferences.
-   * Executed on the UI thread.
-   *
-   * @param trackId the id of the track
-   */
-  public void setSelectedTrackId(final long trackId) {
-    ApiFeatures.getInstance().getApiPlatformAdapter().applyPreferenceChanges(
-        sharedPreferences
-            .edit()
-            .putLong(getString(R.string.selected_track_key), trackId));
+  void clearSelectedTrack() {
+    dataHub.unloadCurrentTrack();
   }
 
   long getSelectedTrackId() {
-    return selectedTrackId;
+    return dataHub.getSelectedTrackId();
   }
 
   /**
    * Binds to track recording service if it is running.
    */
   private void tryBindTrackRecordingService() {
-    Log.d(MyTracksConstants.TAG,
+    Log.d(TAG,
         "MyTracks: Trying to bind to track recording service...");
     bindService(new Intent(this, TrackRecordingService.class),
         serviceConnection, 0);
-    Log.d(MyTracksConstants.TAG, "MyTracks: ...bind finished!");
+    Log.d(TAG, "MyTracks: ...bind finished!");
     isBound = true;
   }
 
@@ -1299,14 +1210,12 @@ public class MyTracks extends TabActivity implements OnTouchListener,
    */
   private void tryUnbindTrackRecordingService() {
     if (isBound) {
-      Log.d(MyTracksConstants.TAG,
-          "MyTracks: Trying to unbind from track recording service...");
+      Log.d(TAG, "MyTracks: Trying to unbind from track recording service...");
       try {
         unbindService(serviceConnection);
-        Log.d(MyTracksConstants.TAG, "MyTracks: ...unbind finished!");
+        Log.d(TAG, "MyTracks: ...unbind finished!");
       } catch (IllegalArgumentException e) {
-        Log.d(MyTracksConstants.TAG,
-            "MyTracks: Tried unbinding, but service was not registered.", e);
+        Log.d(TAG, "MyTracks: Tried unbinding, but service was not registered.", e);
       }
       isBound = false;
     }
@@ -1318,17 +1227,15 @@ public class MyTracks extends TabActivity implements OnTouchListener,
    * @param trackId The id of the track to be sent
    */
   public void saveTrack(long trackId, TrackFileFormat format) {
-    dialogManager.showDialogSafely(DIALOG_WRITE_PROGRESS);
-    final TrackWriter writer =
-        TrackWriterFactory.newWriter(this, providerUtils, trackId, format);
-    writer.setOnCompletion(new Runnable() {
-      public void run() {
-        dialogManager.dismissDialogSafely(DIALOG_WRITE_PROGRESS);
-        dialogManager.showMessageDialog(writer.getErrorMessage(),
-            writer.wasSuccess());
+    TrackWriter writer = TrackWriterFactory.newWriter(this, providerUtils, trackId, format);
+    WriteProgressController controller = new WriteProgressController(this, writer);
+    controller.setOnCompletionListener(new WriteProgressController.OnCompletionListener() {
+      @Override
+      public void onComplete(TrackWriter writer) {
+        dialogManager.showMessageDialog(writer.getErrorMessage(), writer.wasSuccess());
       }
     });
-    writer.writeTrackAsync();
+    controller.startWrite();
   }
 
   /**
@@ -1339,9 +1246,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
    * @param trackId The id of the track to be sent
    */
   public void sendTrack(long trackId, final TrackFileFormat format) {
-    dialogManager.showDialogSafely(DIALOG_WRITE_PROGRESS);
-    final TrackWriter writer =
-        TrackWriterFactory.newWriter(this, providerUtils, trackId, format);
+    TrackWriter writer = TrackWriterFactory.newWriter(this, providerUtils, trackId, format);
 
     FileUtils fileUtils = new FileUtils();
     String extension = format.getExtension();
@@ -1349,28 +1254,31 @@ public class MyTracks extends TabActivity implements OnTouchListener,
 
     File dir = new File(dirName);
     writer.setDirectory(dir);
-    writer.setOnCompletion(new Runnable() {
-      public void run() {
-        dialogManager.dismissDialogSafely(DIALOG_WRITE_PROGRESS);
+
+    WriteProgressController controller = new WriteProgressController(this, writer);
+    controller.setOnCompletionListener(new WriteProgressController.OnCompletionListener() {
+      @Override
+      public void onComplete(TrackWriter writer) {
         if (!writer.wasSuccess()) {
-          dialogManager.showMessageDialog(writer.getErrorMessage(),
-              writer.wasSuccess());
-        } else {
-          Intent shareIntent = new Intent(Intent.ACTION_SEND);
-          shareIntent.putExtra(Intent.EXTRA_SUBJECT,
-              getResources().getText(R.string.send_track_subject).toString());
-          shareIntent.putExtra(Intent.EXTRA_TEXT,
-              getResources().getText(R.string.send_track_body_format)
-              .toString());
-          shareIntent.setType(format.getMimeType());
-          Uri u = Uri.fromFile(new File(writer.getAbsolutePath()));
-          shareIntent.putExtra(Intent.EXTRA_STREAM, u);
-          startActivity(Intent.createChooser(shareIntent,
-              getResources().getText(R.string.share_track).toString()));
+          dialogManager.showMessageDialog(writer.getErrorMessage(), writer.wasSuccess());
+          return;
         }
+
+        Intent shareIntent = new Intent(Intent.ACTION_SEND);
+        shareIntent.putExtra(Intent.EXTRA_SUBJECT,
+            getResources().getText(R.string.send_track_subject).toString());
+        shareIntent.putExtra(Intent.EXTRA_TEXT,
+            getResources().getText(R.string.send_track_body_format)
+            .toString());
+        shareIntent.setType(format.getMimeType());
+        Uri u = Uri.fromFile(new File(writer.getAbsolutePath()));
+        shareIntent.putExtra(Intent.EXTRA_STREAM, u);
+        startActivity(Intent.createChooser(shareIntent,
+            getResources().getText(R.string.share_track).toString()));
       }
     });
-    writer.writeTrackAsync();
+
+    controller.startWrite();
   }
 
   public AccountChooser getAccountChooser() {
@@ -1398,26 +1306,30 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   }
 
   public boolean getSendToGoogleSuccess() {
-    return sendToMyMapsSuccess && sendToFusionTablesSuccess && sendToDocsSuccess;
+    return sendToFusionTablesSuccess && sendToDocsSuccess;
   }
 
   // @VisibleForTesting
   long getRecordingTrackId() {
-    return recordingTrackId;
+    return sharedPreferences.getLong(getString(R.string.recording_track_key), -1);
   }
-
+  
   // @VisibleForTesting
   SharedPreferences getSharedPreferences() {
     return sharedPreferences;
   }
-
+  
   // @VisibleForTesting
   static void clearInstance() {
     instance = null;
   }
-
+  
   // @VisibleForTesting
   ITrackRecordingService getTrackRecordingService() {
     return trackRecordingService;
   }
+
+  public TrackDataHub getDataHub() {
+    return dataHub;
+  }
 }

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

@@ -15,7 +15,7 @@
  */
 package com.google.android.apps.mytracks;
 
-import static com.google.android.apps.mytracks.MyTracksConstants.TAG;
+import static com.google.android.apps.mytracks.Constants.TAG;
 import com.google.android.apps.mytracks.content.Sensor;
 import com.google.android.apps.mytracks.services.ITrackRecordingService;
 import com.google.android.apps.mytracks.services.sensors.SensorUtils;
@@ -103,7 +103,7 @@ public class SensorStateActivity extends Activity {
     ITrackRecordingService service =
     	mt == null ? null : mt.getTrackRecordingService();
     if (service == null) {
-      Log.d(MyTracksConstants.TAG, "Could not get track recording service.");
+      Log.d(Constants.TAG, "Could not get track recording service.");
       updateSensorState(Sensor.SensorState.NONE);
       updateSensorData(null);
       return;
@@ -116,9 +116,9 @@ public class SensorStateActivity extends Activity {
         updateSensorData(sds);
       }
     } catch (RemoteException e) {
-      Log.e(MyTracksConstants.TAG, "Could not read sensor data.", e);
+      Log.e(Constants.TAG, "Could not read sensor data.", e);
     } catch (InvalidProtocolBufferException e) {
-      Log.e(MyTracksConstants.TAG, "Could not read sensor data.", e);
+      Log.e(Constants.TAG, "Could not read sensor data.", e);
     }
     updateSensorData(sds);
 
@@ -126,7 +126,7 @@ public class SensorStateActivity extends Activity {
       int i = service.getSensorState();
       updateSensorState(Sensor.SensorState.valueOf(i));
     } catch (RemoteException e) {
-      Log.e(MyTracksConstants.TAG, "Could not read sensor state.", e);
+      Log.e(Constants.TAG, "Could not read sensor state.", e);
       updateSensorState(Sensor.SensorState.NONE);
     }
   }

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

@@ -15,31 +15,38 @@
  */
 package com.google.android.apps.mytracks;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import static com.google.android.apps.mytracks.Constants.TAG;
 
 import com.google.android.apps.mytracks.io.backup.BackupActivityHelper;
 import com.google.android.apps.mytracks.io.backup.BackupPreferencesListener;
-import com.google.android.apps.mytracks.services.StatusAnnouncerFactory;
 import com.google.android.apps.mytracks.services.sensors.ant.AntUtils;
+import com.google.android.apps.mytracks.services.tasks.StatusAnnouncerFactory;
 import com.google.android.apps.mytracks.util.ApiFeatures;
 import com.google.android.apps.mytracks.util.BluetoothDeviceUtils;
 import com.google.android.maps.mytracks.R;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceManager;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import android.util.Log;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * An activity that let's the user see and edit the settings.
@@ -47,28 +54,14 @@ import android.provider.Settings;
  * @author Leif Hendrik Wilden
  * @author Rodrigo Damazio
  */
-public class MyTracksSettings extends PreferenceActivity {
-
-  public static final String SETTINGS_NAME = "MyTracksSettings";
-
-  /*
-   * Default values - keep in sync with those in preferences.xml.
-   */
-  public static final int DEFAULT_AUTO_RESUME_TRACK_TIMEOUT = 10;  // In min.
-  public static final int DEFAULT_ANNOUNCEMENT_FREQUENCY = -1;
-  public static final int DEFAULT_MAX_RECORDING_DISTANCE = 200;
-  public static final int DEFAULT_MIN_RECORDING_DISTANCE = 5;
-  public static final int DEFAULT_MIN_RECORDING_INTERVAL = 0;
-  public static final int DEFAULT_MIN_REQUIRED_ACCURACY = 200;
-  public static final int DEFAULT_SPLIT_FREQUENCY = 0;
+public class SettingsActivity extends PreferenceActivity {
 
   private BackupPreferencesListener backupListener;
-
   private SharedPreferences preferences;
 
   /** Called when the activity is first created. */
   @Override
-  public void onCreate(Bundle icicle) {
+  protected void onCreate(Bundle icicle) {
     super.onCreate(icicle);
 
     // The volume we want to control is the Text-To-Speech volume
@@ -79,7 +72,7 @@ public class MyTracksSettings extends PreferenceActivity {
 
     // Tell it where to read/write preferences
     PreferenceManager preferenceManager = getPreferenceManager();
-    preferenceManager.setSharedPreferencesName(SETTINGS_NAME);
+    preferenceManager.setSharedPreferencesName(Constants.SETTINGS_NAME);
     preferenceManager.setSharedPreferencesMode(0);
 
     // Set up automatic preferences backup
@@ -119,6 +112,16 @@ public class MyTracksSettings extends PreferenceActivity {
       announcementFrequency.setSummary(
           R.string.settings_not_available_summary);
     }
+
+    // Hook up action for resetting all settings
+    Preference resetPreference = findPreference(getString(R.string.reset_key));
+    resetPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+      @Override
+      public boolean onPreferenceClick(Preference arg0) {
+        onResetPreferencesClick();
+        return true;
+      }
+    });
   }
 
   private void customizeSensorOptionsPreferences() {
@@ -177,19 +180,24 @@ public class MyTracksSettings extends PreferenceActivity {
         findPreference(getString(R.string.backup_to_sd_key));
     Preference restoreNowPreference =
         findPreference(getString(R.string.restore_from_sd_key));
+    Preference resetPreference = findPreference(getString(R.string.reset_key));
 
-    // If recording, disable backup/restore
+    // If recording, disable backup/restore/reset
     // (we don't want to get to inconsistent states)
     boolean recording =
         preferences.getLong(getString(R.string.recording_track_key), -1) != -1;
     backupNowPreference.setEnabled(!recording);
     restoreNowPreference.setEnabled(!recording);
+    resetPreference.setEnabled(!recording);
     backupNowPreference.setSummary(
-        recording ? R.string.settings_no_backup_while_recording
+        recording ? R.string.settings_not_while_recording
                   : R.string.settings_backup_to_sd_summary);
     restoreNowPreference.setSummary(
-        recording ? R.string.settings_no_backup_while_recording
+        recording ? R.string.settings_not_while_recording
                   : R.string.settings_restore_from_sd_summary);
+    resetPreference.setSummary(
+        recording ? R.string.settings_not_while_recording
+                  : R.string.settings_reset_summary);
 
     // Add actions to the backup preferences
     backupNowPreference.setOnPreferenceClickListener(
@@ -197,7 +205,7 @@ public class MyTracksSettings extends PreferenceActivity {
           @Override
           public boolean onPreferenceClick(Preference preference) {
             BackupActivityHelper backupHelper =
-                new BackupActivityHelper(MyTracksSettings.this);
+                new BackupActivityHelper(SettingsActivity.this);
             backupHelper.writeBackup();
             return true;
           }
@@ -207,7 +215,7 @@ public class MyTracksSettings extends PreferenceActivity {
           @Override
           public boolean onPreferenceClick(Preference preference) {
             BackupActivityHelper backupHelper =
-                new BackupActivityHelper(MyTracksSettings.this);
+                new BackupActivityHelper(SettingsActivity.this);
             backupHelper.restoreBackup();
             return true;
           }
@@ -258,9 +266,6 @@ public class MyTracksSettings extends PreferenceActivity {
     final ListPreference minRequiredAccuracy =
         (ListPreference) findPreference(
             getString(R.string.min_required_accuracy_key));
-    final ListPreference splitFrequency =
-        (ListPreference) findPreference(
-            getString(R.string.split_frequency_key));
 
     minRecordingDistance.setEntries(isMetric
         ? R.array.min_recording_distance_options
@@ -271,11 +276,20 @@ public class MyTracksSettings extends PreferenceActivity {
     minRequiredAccuracy.setEntries(isMetric
         ? R.array.min_required_accuracy_options
         : R.array.min_required_accuracy_options_ft);
-    splitFrequency.setEntries(isMetric
-        ? R.array.split_frequency_options
-        : R.array.split_frequency_options_ft);
+    setTaskOptions(isMetric, R.string.announcement_frequency_key);
+    setTaskOptions(isMetric, R.string.split_frequency_key);
   }
 
+  /**
+   * Set the user visible options for a periodic task.
+   */
+  private void setTaskOptions(boolean isMetric, int listId) {
+    final ListPreference taskFrequency =
+        (ListPreference) findPreference(getString(listId));
+    taskFrequency.setEntries(isMetric
+        ? R.array.task_frequency_options
+        : R.array.task_frequency_options_ft);
+  }
 
   /**
    * Configures preference actions related to bluetooth.
@@ -315,4 +329,53 @@ public class MyTracksSettings extends PreferenceActivity {
     devicesPreference.setEntryValues(entryValuesArray);
     devicesPreference.setEntries(entriesArray);
   }
+
+  /** Callback for when user asks to reset all settings. */
+  private void onResetPreferencesClick() {
+    AlertDialog dialog = new AlertDialog.Builder(this)
+        .setCancelable(true)
+        .setTitle(R.string.settings_reset)
+        .setMessage(R.string.settings_reset_dialog_message)
+        .setPositiveButton(android.R.string.ok,
+            new OnClickListener() {
+              @Override
+              public void onClick(DialogInterface dialog, int button) {
+                onResetPreferencesConfirmed();
+              }
+            })
+        .setNegativeButton(android.R.string.cancel, null)
+        .create();
+    dialog.show();
+  }
+
+  /** Callback for when user confirms resetting all settings. */
+  private void onResetPreferencesConfirmed() {
+    // Change preferences in a separate thread.
+    new Thread() {
+      @Override
+      public void run() {
+        Log.i(TAG, "Resetting all settings");
+
+        // Actually wipe preferences (and save synchronously).
+        preferences.edit().clear().commit();
+
+        // Give UI feedback in the UI thread.
+        runOnUiThread(new Runnable() {
+          @Override
+          public void run() {
+            // Give feedback to the user.
+            Toast.makeText(
+                SettingsActivity.this,
+                R.string.settings_reset_done,
+                Toast.LENGTH_SHORT).show();
+
+            // Restart the settings activity so all changes are loaded.
+            Intent intent = getIntent();
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+          }
+        });
+      }
+    }.start();
+  }
 }

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

@@ -15,26 +15,20 @@
  */
 package com.google.android.apps.mytracks;
 
-import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
-import com.google.android.apps.mytracks.content.MyTracksProviderUtilsImpl;
+import static com.google.android.apps.mytracks.Constants.TAG;
+
 import com.google.android.apps.mytracks.content.Track;
-import com.google.android.apps.mytracks.content.TracksColumns;
-import com.google.android.apps.mytracks.content.WaypointsColumns;
-import com.google.android.apps.mytracks.services.StatusAnnouncerFactory;
+import com.google.android.apps.mytracks.content.TrackDataHub;
+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.tasks.StatusAnnouncerFactory;
 import com.google.android.apps.mytracks.util.ApiFeatures;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.database.ContentObserver;
 import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.location.LocationProvider;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Menu;
@@ -42,66 +36,41 @@ import android.view.MenuItem;
 import android.view.Window;
 import android.widget.ScrollView;
 import android.widget.TextView;
-import android.widget.Toast;
+
+import java.util.EnumSet;
 
 /**
  * An activity that displays track statistics to the user.
  *
  * @author Sandor Dornbush
+ * @author Rodrigo Damazio
  */
-public class StatsActivity extends Activity
-    implements OnSharedPreferenceChangeListener {
-
+public class StatsActivity extends Activity implements TrackDataListener {
   private StatsUtilities utils;
   private UIUpdateThread thread;
 
-  private ContentObserver observer;
-
-  /**
-   * The id of the currently selected track.
-   */
-  private long selectedTrackId = -1;
-
-  /**
-   * The id of the currently recording track.
-   */
-  private long recordingTrackId = -1;
-
   /**
    * The start time of the selected track.
    */
   private long startTime = -1;
 
-  /**
-   * True if distances should be displayed in metric units (from shared
-   * preferences).
-   */
-  private boolean metricUnits = true;
-
-  /**
-   * True if pace should be displayed as dist/time (from shared preferences).
-   */
-  private boolean displaySpeed = true;
-
-  /**
-   * true if activity has resumed and is on top
-   */
-  private boolean activityOnTop = false;
-
   /**
    * If true, the statistics for the current segment are shown, otherwise
    * for the full track.
    */
   private boolean showCurrentSegment = false;
 
-  private MyTracksProviderUtils providerUtils;
+  private TrackDataHub dataHub;
 
   /**
    * A runnable for posting to the UI thread. Will update the total time field.
    */
   private final Runnable updateResults = new Runnable() {
     public void run() {
-      updateTotalTime();
+      if (dataHub.isRecordingSelected()) {
+        utils.setTime(R.id.total_time_register,
+            System.currentTimeMillis() - startTime);
+      }
     }
   };
 
@@ -112,24 +81,22 @@ public class StatsActivity extends Activity
 
     public UIUpdateThread() {
       super();
-      Log.i(MyTracksConstants.TAG, "Created UI update thread");
+      Log.i(TAG, "Created UI update thread");
     }
 
     @Override
     public void run() {
-      Log.i(MyTracksConstants.TAG, "Started UI update thread");
+      Log.i(TAG, "Started UI update thread");
       while (MyTracks.getInstance().isRecording()) {
-        long sleeptime = 1000;
         runOnUiThread(updateResults);
         try {
-          Thread.sleep(sleeptime);
+          Thread.sleep(1000L);
         } catch (InterruptedException e) {
-          Log.w(MyTracksConstants.TAG,
-              "StatsActivity: Caught exception on sleep.", e);
+          Log.w(TAG, "StatsActivity: Caught exception on sleep.", e);
           break;
         }
       }
-      Log.w(MyTracksConstants.TAG, "UIUpdateThread finished.");
+      Log.w(TAG, "UIUpdateThread finished.");
     }
   }
 
@@ -138,9 +105,9 @@ public class StatsActivity extends Activity
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
 
+    dataHub = MyTracks.getInstance().getDataHub();
     utils = new StatsUtilities(this);
-    providerUtils = new MyTracksProviderUtilsImpl(getContentResolver());
-    
+
     // The volume we want to control is the Text-To-Speech volume
     int volumeStream =
         new StatusAnnouncerFactory(ApiFeatures.getInstance()).getVolumeStream();
@@ -151,40 +118,10 @@ public class StatsActivity extends Activity
 
     setContentView(R.layout.stats);
 
-    Handler contentHandler = new Handler();
-    observer = new ContentObserver(contentHandler) {
-      @Override
-      public void onChange(boolean selfChange) {
-        Log.d(MyTracksConstants.TAG, "StatsActivity: ContentObserver.onChange");
-        restoreStats();
-        super.onChange(selfChange);
-      }
-    };
-
     ScrollView sv = ((ScrollView) findViewById(R.id.scrolly));
     sv.setScrollBarStyle(ScrollView.SCROLLBARS_OUTSIDE_INSET);
 
-    SharedPreferences preferences =
-        getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
-    if (preferences != null) {
-      selectedTrackId = preferences.getLong(
-          getString(R.string.selected_track_key), -1);
-      recordingTrackId = preferences.getLong(
-          getString(R.string.recording_track_key), -1);
-      metricUnits = preferences.getBoolean(
-          getString(R.string.metric_units_key), true);
-      displaySpeed =
-        preferences.getBoolean(getString(R.string.report_speed_key), true);
-      checkLiveTrack();
-      restoreStats();
-      showUnknownLocation();
-      preferences.registerOnSharedPreferenceChangeListener(this);
-    }
-    utils.setMetricUnits(metricUnits);
-    utils.setReportSpeed(displaySpeed);
-    utils.updateUnits();
-    utils.setSpeedLabel(R.id.speed_label, R.string.speed, R.string.pace_label);
-    utils.setSpeedLabels();
+    showUnknownLocation();
 
     DisplayMetrics metrics = new DisplayMetrics();
     getWindowManager().getDefaultDisplay().getMetrics(metrics);
@@ -193,89 +130,74 @@ public class StatsActivity extends Activity
     }
   }
 
-  @Override
-  protected void onPause() {
-    unregisterLocationListener();
-    if (thread != null) {
-      thread.interrupt();
-      thread = null;
-    }
-    getContentResolver().unregisterContentObserver(observer);
-    activityOnTop = false;
-    super.onPause();
-  }
-
   @Override
   protected void onResume() {
-    activityOnTop = true;
-    checkLiveTrack();
-    restoreStats();
-    showUnknownLocation();
+    dataHub.registerTrackDataListener(this, EnumSet.of(
+        ListenerDataType.SELECTED_TRACK_CHANGED,
+        ListenerDataType.TRACK_UPDATES,
+        ListenerDataType.LOCATION_UPDATES,
+        ListenerDataType.DISPLAY_PREFERENCES));
+
     super.onResume();
   }
 
   @Override
-  public void onSharedPreferenceChanged(
-      final SharedPreferences sharedPreferences, final String key) {
-    Log.d(MyTracksConstants.TAG,
-        "StatsActivity: onSharedPreferences changed " + key);
-    if (key != null) {
-      runOnUiThread(new Runnable() {
-        @Override
-        public void run() {
-          if (key.equals(getString(R.string.selected_track_key))) {
-            selectedTrackId =
-                sharedPreferences.getLong(
-                    getString(R.string.selected_track_key),
-                    -1);
-            checkLiveTrack();
-            restoreStats();
-            showUnknownLocation();
-          } else if (key.equals(getString(R.string.recording_track_key))) {
-            recordingTrackId =
-                sharedPreferences.getLong(
-                    getString(R.string.recording_track_key),
-                    -1);
-            checkLiveTrack();
-            restoreStats();
-            showUnknownLocation();
-          } else if (key.equals(getString(R.string.metric_units_key))) {
-            metricUnits =
-                sharedPreferences.getBoolean(
-                    getString(R.string.metric_units_key), true);
-            utils.setMetricUnits(metricUnits);
-            utils.updateUnits();
-            restoreStats();
-          } else if (key.equals(getString(R.string.report_speed_key))) {
-            displaySpeed =
-                sharedPreferences.getBoolean(
-                    getString(R.string.report_speed_key),
-                    true);
-            utils.setReportSpeed(displaySpeed);
-            utils.updateUnits();
-            utils.setSpeedLabel(
-                R.id.speed_label, R.string.speed, R.string.pace_label);
-            Log.w(MyTracksConstants.TAG, "Setting speed labels");
-            utils.setSpeedLabels();
-            restoreStats();
-          }
-        }
-      });
+  protected void onPause() {
+    dataHub.unregisterTrackDataListener(this);
+
+    if (thread != null) {
+      thread.interrupt();
+      thread = null;
     }
+
+    super.onStop();
+  }
+
+  @Override
+  public boolean onUnitsChanged(boolean metric) {
+    // Ignore if unchanged.
+    if (metric == utils.isMetricUnits()) return false;
+
+    utils.setMetricUnits(metric);
+    updateLabels();
+
+    return true;  // Reload data
+  }
+
+  @Override
+  public boolean onReportSpeedChanged(boolean displaySpeed) {
+    // Ignore if unchanged.
+    if (displaySpeed == utils.isReportSpeed()) return false;
+
+    utils.setReportSpeed(displaySpeed);
+    updateLabels();
+  
+    return true;  // Reload data
+  }
+
+  private void updateLabels() {
+    runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        utils.updateUnits();
+        utils.setSpeedLabel(R.id.speed_label, R.string.speed, R.string.pace_label);
+        utils.setSpeedLabels();
+      }
+    });
   }
 
   @Override
   public boolean onCreateOptionsMenu(Menu menu) {
     super.onCreateOptionsMenu(menu);
     MenuItem currentSegment = menu.add(0,
-        MyTracksConstants.MENU_CURRENT_SEGMENT, 0, R.string.current_segment);
+        Constants.MENU_CURRENT_SEGMENT, 0, R.string.current_segment);
     currentSegment.setIcon(R.drawable.ic_menu_lastsegment);
     return true;
   }
 
   @Override
   public boolean onPrepareOptionsMenu(Menu menu) {
-    MenuItem item = menu.findItem(MyTracksConstants.MENU_CURRENT_SEGMENT);
+    MenuItem item = menu.findItem(Constants.MENU_CURRENT_SEGMENT);
     if (item != null) {
       item.setTitle(showCurrentSegment
           ? getString(R.string.current_track)
@@ -287,139 +209,14 @@ public class StatsActivity extends Activity
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
-      case MyTracksConstants.MENU_CURRENT_SEGMENT:
+      case Constants.MENU_CURRENT_SEGMENT:
         showCurrentSegment = !showCurrentSegment;
-        restoreStats();
+        // TODO: Re-read only the data that interests us
         return true;
     }
     return super.onOptionsItemSelected(item);
   }
 
-  private final LocationListener locationListener = new LocationListener() {
-    @Override
-    public void onLocationChanged(Location l) {
-      if (selectedTrackIsRecording()) {
-        showLocation(l);
-      }
-    }
-  
-    @Override
-    public void onProviderDisabled(String provider) {
-      // Do nothing
-    }
-  
-    @Override
-    public void onProviderEnabled(String provider) {
-      // Do nothing
-    }
-  
-    @Override
-    public void onStatusChanged(String provider, int status, Bundle extras) {
-      // Do nothing
-    }
-  };
-
-  /**
-   * Registers to receive location updates from the GPS location provider.
-   */
-  private void registerLocationListener() {
-    LocationManager locationManager =
-        (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-    if (locationManager != null) {
-      LocationProvider gpsProvider =
-          locationManager.getProvider(MyTracksConstants.GPS_PROVIDER);
-      if (gpsProvider == null) {
-        Toast.makeText(this, getString(R.string.error_no_gps_location_provider),
-            Toast.LENGTH_LONG).show();
-        return;
-      } else {
-        Log.d(MyTracksConstants.TAG, "StatsActivity: Using location provider "
-            + gpsProvider.getName());
-      }
-      locationManager.requestLocationUpdates(gpsProvider.getName(),
-         0/*minTime*/, 0/*minDist*/, locationListener);
-    }
-  }
-
-  /**
-   * Unregisters all location listener.
-   */
-  private void unregisterLocationListener() {
-    LocationManager locationManager =
-        (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-    if (locationManager != null) {
-      locationManager.removeUpdates(locationListener);
-    }
-  }
-
-  /**
-   * @return true if the selected track is the currently recording track
-   */
-  private boolean selectedTrackIsRecording() {
-    return MyTracks.getInstance().isRecording()
-        && selectedTrackId == recordingTrackId;
-  }
-
-  /**
-   * Reads values for selected tracks from provider and update the UI.
-   */
-  private void restoreStats() {
-    if (selectedTrackId < 0) {
-      utils.setAllToUnknown();
-      return;
-    }
-
-    Track track = providerUtils.getTrack(selectedTrackId);
-    if (track == null || track.getStatistics() == null) {
-      utils.setAllToUnknown();
-      return;
-    }
-
-    startTime = track.getStatistics().getStartTime();
-    if (!selectedTrackIsRecording()) {
-      utils.setTime(R.id.total_time_register,
-          track.getStatistics().getTotalTime());
-    }
-    utils.setAllStats(track.getStatistics());
-  }
-
-  /**
-   * Checks if this activity needs to update live track data or not.
-   * If so, make sure that:
-   * a) a thread keeps updating the total time
-   * b) a location listener is registered
-   * c) a content observer is registered
-   * Otherwise unregister listeners, observers, and kill update thread.
-   */
-  private void checkLiveTrack() {
-    final boolean isRecording = selectedTrackIsRecording();
-    final boolean startThread =
-        (thread == null) && isRecording && activityOnTop;
-    final boolean killThread =
-        (thread != null) && (!isRecording || !activityOnTop);
-    if (startThread) {
-      thread = new UIUpdateThread();
-      thread.start();
-      getContentResolver().registerContentObserver(
-          TracksColumns.CONTENT_URI, false, observer);
-      getContentResolver().registerContentObserver(
-          WaypointsColumns.CONTENT_URI, false, observer);
-      registerLocationListener();
-    } else if (killThread) {
-      thread.interrupt();
-      thread = null;
-      getContentResolver().unregisterContentObserver(observer);
-      unregisterLocationListener();
-    }
-  }
-
-  public void updateTotalTime() {
-    if (selectedTrackIsRecording()) {
-      utils.setTime(R.id.total_time_register,
-          System.currentTimeMillis() - startTime);
-    }
-  }
-
   /**
    * Updates the given location fields (latitude, longitude, altitude) and all
    * other fields.
@@ -439,4 +236,122 @@ public class StatsActivity extends Activity
     utils.setUnknown(R.id.longitude_register);
     utils.setUnknown(R.id.speed_register);
   }
+
+  @Override
+  public void onSelectedTrackChanged(Track track, boolean isRecording) {
+    /*
+     * Checks if this activity needs to update live track data or not.
+     * If so, make sure that:
+     * a) a thread keeps updating the total time
+     * b) a location listener is registered
+     * c) a content observer is registered
+     * Otherwise unregister listeners, observers, and kill update thread.
+     */
+    final boolean startThread = (thread == null) && isRecording;
+    final boolean killThread = (thread != null) && (!isRecording);
+    if (startThread) {
+      thread = new UIUpdateThread();
+      thread.start();
+    } else if (killThread) {
+      thread.interrupt();
+      thread = null;
+    }
+  }
+
+  @Override
+  public void onCurrentLocationChanged(final Location loc) {
+    if (dataHub.isRecordingSelected()) {
+      runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          if (loc != null) {
+            showLocation(loc);
+          } else {
+            showUnknownLocation();
+          }
+        }
+      });
+    }
+  }
+
+  @Override
+  public void onCurrentHeadingChanged(double heading) {
+    // We don't care.
+  }
+
+  @Override
+  public void onProviderStateChange(ProviderState state) {
+    switch (state) {
+      case DISABLED:
+      case NO_FIX:
+        runOnUiThread(new Runnable() {
+          @Override
+          public void run() {
+            showUnknownLocation();
+          }
+        });
+        break;
+    }
+  }
+
+  @Override
+  public void onTrackUpdated(final Track track) {
+    runOnUiThread(new Runnable() {
+      @Override
+      public void run() {
+        if (track == null || track.getStatistics() == null) {
+          utils.setAllToUnknown();
+          return;
+        }
+
+        startTime = track.getStatistics().getStartTime();
+        if (!dataHub.isRecordingSelected()) {
+          utils.setTime(R.id.total_time_register,
+              track.getStatistics().getTotalTime());
+          showUnknownLocation();
+        }
+        utils.setAllStats(track.getStatistics());
+      }
+    });
+  }
+
+  @Override
+  public void clearWaypoints() {
+    // We don't care.
+  }
+
+  @Override
+  public void onNewWaypoint(Waypoint wpt) {
+    // We don't care.
+  }
+
+  @Override
+  public void onNewWaypointsDone() {
+    // We don't care.
+  }
+
+  @Override
+  public void clearTrackPoints() {
+    // We don't care.
+  }
+
+  @Override
+  public void onNewTrackPoint(Location loc) {
+    // We don't care.
+  }
+
+  @Override
+  public void onSegmentSplit() {
+    // We don't care.
+  }
+
+  @Override
+  public void onSampledOutTrackPoint(Location loc) {
+    // We don't care.
+  }
+
+  @Override
+  public void onNewTrackPointsDone() {
+    // We don't care.
+  }
 }

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

@@ -83,6 +83,8 @@ public class StatsUtilities {
   public void setText(int id, double d, NumberFormat format) {
     if (!Double.isNaN(d) && !Double.isInfinite(d)) {
       setText(id, format.format(d));
+    } else {
+      setUnknown(id);
     }
   }
 
@@ -218,7 +220,7 @@ public class StatsUtilities {
     setGrade(R.id.max_grade_register, maxGrade);
   }
 
-	public void setAllStats(TripStatistics stats) {
+  public void setAllStats(TripStatistics stats) {
     setTime(R.id.moving_time_register, stats.getMovingTime());
     setDistance(R.id.total_distance_register, stats.getTotalDistance() / 1000);
     setSpeed(R.id.average_speed_register, stats.getAverageSpeed() * 3.6);
@@ -235,7 +237,7 @@ public class StatsUtilities {
   }
 
   public void setSpeedLabel(int id, int speedString, int paceString) {
-    Log.w(MyTracksConstants.TAG, "Setting view " + id +
+    Log.w(Constants.TAG, "Setting view " + id +
           " to " + reportSpeed +
           " speed: " + speedString +
           " pace: " + paceString);
@@ -243,7 +245,7 @@ public class StatsUtilities {
     if (tv != null) {
       tv.setText(reportSpeed ?  speedString : paceString);
     } else {
-      Log.w(MyTracksConstants.TAG, "Could not find id: " + id);
+      Log.w(Constants.TAG, "Could not find id: " + id);
     }
   }
 

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

@@ -37,7 +37,7 @@ import android.widget.EditText;
  *
  * @author Leif Hendrik Wilden
  */
-public class MyTracksDetails extends Activity implements OnClickListener {
+public class TrackDetails extends Activity implements OnClickListener {
 
   /**
    * The id of the track being edited (taken from bundle, "trackid")
@@ -56,7 +56,7 @@ public class MyTracksDetails extends Activity implements OnClickListener {
     // Required extra when launching this intent:
     trackId = getIntent().getLongExtra("trackid", -1);
     if (trackId < 0) {
-      Log.d(MyTracksConstants.TAG,
+      Log.d(Constants.TAG,
           "MyTracksDetails intent was launched w/o track id.");
       finish();
       return;

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

@@ -45,7 +45,7 @@ import android.widget.TextView;
  *
  * @author Leif Hendrik Wilden
  */
-public class MyTracksList extends ListActivity
+public class TrackList extends ListActivity
     implements SharedPreferences.OnSharedPreferenceChangeListener,
         View.OnClickListener {
 
@@ -70,40 +70,40 @@ public class MyTracksList extends ListActivity
           AdapterView.AdapterContextMenuInfo info =
               (AdapterView.AdapterContextMenuInfo) menuInfo;
           contextPosition = info.position;
-          trackId = MyTracksList.this.listView.getAdapter().getItemId(
+          trackId = TrackList.this.listView.getAdapter().getItemId(
               contextPosition);
-          menu.add(0, MyTracksConstants.MENU_SHOW, 0,
+          menu.add(0, Constants.MENU_SHOW, 0,
               R.string.tracklist_show_track);
-          menu.add(0, MyTracksConstants.MENU_EDIT, 0,
+          menu.add(0, Constants.MENU_EDIT, 0,
               R.string.tracklist_edit_track);
           if (!MyTracks.getInstance().isRecording()
               || trackId != recordingTrackId) {
-            menu.add(0, MyTracksConstants.MENU_SEND_TO_GOOGLE, 0,
+            menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
                 R.string.tracklist_send_to_google);
-            SubMenu share = menu.addSubMenu(0, MyTracksConstants.MENU_SHARE, 0,
+            SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
                 R.string.tracklist_share_track);
-            share.add(0, MyTracksConstants.MENU_SHARE_LINK, 0,
+            share.add(0, Constants.MENU_SHARE_LINK, 0,
                 R.string.tracklist_share_link);
-            share.add(0, MyTracksConstants.MENU_SHARE_GPX_FILE, 0,
+            share.add(0, Constants.MENU_SHARE_GPX_FILE, 0,
                 R.string.tracklist_share_gpx_file);
-            share.add(0, MyTracksConstants.MENU_SHARE_KML_FILE, 0,
+            share.add(0, Constants.MENU_SHARE_KML_FILE, 0,
                 R.string.tracklist_share_kml_file);
-            share.add(0, MyTracksConstants.MENU_SHARE_CSV_FILE, 0,
+            share.add(0, Constants.MENU_SHARE_CSV_FILE, 0,
                 R.string.tracklist_share_csv_file);
-            share.add(0, MyTracksConstants.MENU_SHARE_TCX_FILE, 0,
+            share.add(0, Constants.MENU_SHARE_TCX_FILE, 0,
                 R.string.tracklist_share_tcx_file);
             SubMenu save = menu.addSubMenu(0,
-                MyTracksConstants.MENU_WRITE_TO_SD_CARD, 0,
+                Constants.MENU_WRITE_TO_SD_CARD, 0,
                 R.string.tracklist_write_to_sd);
-            save.add(0, MyTracksConstants.MENU_SAVE_GPX_FILE, 0,
+            save.add(0, Constants.MENU_SAVE_GPX_FILE, 0,
                 R.string.tracklist_save_as_gpx);
-            save.add(0, MyTracksConstants.MENU_SAVE_KML_FILE, 0,
+            save.add(0, Constants.MENU_SAVE_KML_FILE, 0,
                 R.string.tracklist_save_as_kml);
-            save.add(0, MyTracksConstants.MENU_SAVE_CSV_FILE, 0,
+            save.add(0, Constants.MENU_SAVE_CSV_FILE, 0,
                 R.string.tracklist_save_as_csv);
-            save.add(0, MyTracksConstants.MENU_SAVE_TCX_FILE, 0,
+            save.add(0, Constants.MENU_SAVE_TCX_FILE, 0,
                 R.string.tracklist_save_as_tcx);
-            menu.add(0, MyTracksConstants.MENU_DELETE, 0,
+            menu.add(0, Constants.MENU_DELETE, 0,
                 R.string.tracklist_delete_track);
           }
         }
@@ -132,7 +132,7 @@ public class MyTracksList extends ListActivity
   protected void onListItemClick(ListView l, View v, int position, long id) {
     Intent result = new Intent();
     result.putExtra("trackid", id);
-    setResult(MyTracksConstants.SHOW_TRACK, result);
+    setResult(Constants.SHOW_TRACK, result);
     finish();
   }
 
@@ -140,24 +140,24 @@ public class MyTracksList extends ListActivity
   public boolean onMenuItemSelected(int featureId, MenuItem item) {
     if (!super.onMenuItemSelected(featureId, item)) {
       switch (item.getItemId()) {
-        case MyTracksConstants.MENU_SHOW: {
+        case Constants.MENU_SHOW: {
           onListItemClick(null, null, 0, trackId);
           return true;
         }
-        case MyTracksConstants.MENU_EDIT: {
-          Intent intent = new Intent(this, MyTracksDetails.class);
+        case Constants.MENU_EDIT: {
+          Intent intent = new Intent(this, TrackDetails.class);
           intent.putExtra("trackid", trackId);
           startActivity(intent);
           return true;
         }
-        case MyTracksConstants.MENU_SHARE:
-        case MyTracksConstants.MENU_WRITE_TO_SD_CARD:
+        case Constants.MENU_SHARE:
+        case Constants.MENU_WRITE_TO_SD_CARD:
           return false;
         default: {
           Intent result = new Intent();
           result.putExtra("trackid", trackId);
           setResult(
-              MyTracksConstants.getActionFromMenuId(item.getItemId()), result);
+              Constants.getActionFromMenuId(item.getItemId()), result);
           finish();
           return true;
         }
@@ -170,7 +170,7 @@ public class MyTracksList extends ListActivity
   public void onClick(View v) {
     switch (v.getId()) {
       case R.id.tracklist_btn_delete_all: {
-        Handler h = new MyTracksDeleteAllTracks(this, null);
+        Handler h = new DeleteAllTracks(this, null);
         h.handleMessage(null);
         break;
       }
@@ -197,12 +197,17 @@ public class MyTracksList extends ListActivity
     listView = getListView();
     listView.setOnCreateContextMenuListener(contextMenuListener);
 
-    findViewById(R.id.tracklist_btn_delete_all).setOnClickListener(this);
-    findViewById(R.id.tracklist_btn_export_all).setOnClickListener(this);
+    View deleteAll = findViewById(R.id.tracklist_btn_delete_all);
+    View exportAll = findViewById(R.id.tracklist_btn_export_all);
+    boolean notRecording = !MyTracks.getInstance().isRecording();
+    deleteAll.setOnClickListener(this);
+    deleteAll.setEnabled(notRecording);
+    exportAll.setOnClickListener(this);
+    exportAll.setEnabled(notRecording);
     findViewById(R.id.tracklist_btn_import_all).setOnClickListener(this);
 
     SharedPreferences preferences =
-        getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+        getSharedPreferences(Constants.SETTINGS_NAME, 0);
     preferences.registerOnSharedPreferenceChangeListener(this);
     metricUnits =
         preferences.getBoolean(getString(R.string.metric_units_key), true);

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

@@ -39,7 +39,7 @@ import android.widget.ImageView;
  *
  * @author Leif Hendrik Wilden
  */
-public class MyTracksWaypointDetails extends Activity
+public class WaypointDetails extends Activity
     implements OnClickListener {
 
   public static final String WAYPOINT_ID_EXTRA = "com.google.android.apps.mytracks.WAYPOINT_ID";
@@ -65,7 +65,7 @@ public class MyTracksWaypointDetails extends Activity
 
     utils = new StatsUtilities(this);
     SharedPreferences preferences =
-        getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+        getSharedPreferences(Constants.SETTINGS_NAME, 0);
     if (preferences != null) {
       boolean useMetric =
           preferences.getBoolean(getString(R.string.metric_units_key), true);
@@ -82,7 +82,7 @@ public class MyTracksWaypointDetails extends Activity
     // Required extra when launching this intent:
     waypointId = getIntent().getLongExtra(WAYPOINT_ID_EXTRA, -1);
     if (waypointId < 0) {
-      Log.d(MyTracksConstants.TAG,
+      Log.d(Constants.TAG,
           "MyTracksWaypointsDetails intent was launched w/o waypoint id.");
       finish();
       return;

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

@@ -49,7 +49,7 @@ import android.widget.TextView;
  *
  * @author Leif Hendrik Wilden
  */
-public class MyTracksWaypointsList extends ListActivity
+public class WaypointsList extends ListActivity
     implements View.OnClickListener {
 
   private int contextPosition = -1;
@@ -59,7 +59,6 @@ public class MyTracksWaypointsList extends ListActivity
   private Button insertWaypointButton = null;
   private Button insertStatisticsButton = null;
   private long recordingTrackId = -1;
-  private long selectedTrackId = -1;
   private MyTracksProviderUtils providerUtils;
 
   private Cursor waypointsCursor = null;
@@ -72,14 +71,14 @@ public class MyTracksWaypointsList extends ListActivity
           AdapterView.AdapterContextMenuInfo info =
               (AdapterView.AdapterContextMenuInfo) menuInfo;
           contextPosition = info.position;
-          waypointId = MyTracksWaypointsList.this.listView.getAdapter()
+          waypointId = WaypointsList.this.listView.getAdapter()
               .getItemId(contextPosition);
           int type = providerUtils.getWaypoint(info.id).getType();
-          menu.add(0, MyTracksConstants.MENU_SHOW, 0,
+          menu.add(0, Constants.MENU_SHOW, 0,
               R.string.waypointslist_show_waypoint);
-          menu.add(0, MyTracksConstants.MENU_EDIT, 0,
+          menu.add(0, Constants.MENU_EDIT, 0,
               R.string.waypointslist_edit_waypoint);
-          menu.add(0, MyTracksConstants.MENU_DELETE, 0,
+          menu.add(0, Constants.MENU_DELETE, 0,
               R.string.waypointslist_delete_waypoint).setEnabled(
                   recordingTrackId < 0 || type == Waypoint.TYPE_WAYPOINT ||
                   info.id != providerUtils.getLastWaypointId(recordingTrackId));
@@ -90,8 +89,8 @@ public class MyTracksWaypointsList extends ListActivity
   protected void onListItemClick(ListView l, View v, int position, long id) {
     Intent result = new Intent();
     result.putExtra("trackid", trackId);
-    result.putExtra(MyTracksWaypointDetails.WAYPOINT_ID_EXTRA, id);
-    setResult(MyTracksConstants.EDIT_WAYPOINT, result);
+    result.putExtra(WaypointDetails.WAYPOINT_ID_EXTRA, id);
+    setResult(Constants.EDIT_WAYPOINT, result);
     finish();
   }
 
@@ -99,18 +98,18 @@ public class MyTracksWaypointsList extends ListActivity
   public boolean onMenuItemSelected(int featureId, MenuItem item) {
     if (!super.onMenuItemSelected(featureId, item)) {
       switch (item.getItemId()) {
-        case MyTracksConstants.MENU_SHOW: {
+        case Constants.MENU_SHOW: {
           onListItemClick(null, null, 0, waypointId);
           return true;
         }
-        case MyTracksConstants.MENU_EDIT: {
-          Intent intent = new Intent(this, MyTracksWaypointDetails.class);
+        case Constants.MENU_EDIT: {
+          Intent intent = new Intent(this, WaypointDetails.class);
           intent.putExtra("trackid", trackId);
-          intent.putExtra(MyTracksWaypointDetails.WAYPOINT_ID_EXTRA, waypointId);
+          intent.putExtra(WaypointDetails.WAYPOINT_ID_EXTRA, waypointId);
           startActivity(intent);
           return true;
         }
-        case MyTracksConstants.MENU_DELETE: {
+        case Constants.MENU_DELETE: {
           deleteWaypoint(waypointId);
         }
       }
@@ -139,7 +138,10 @@ public class MyTracksWaypointsList extends ListActivity
         (Button) findViewById(R.id.waypointslist_btn_insert_statistics);
     insertStatisticsButton.setOnClickListener(this);
     SharedPreferences preferences =
-        getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+        getSharedPreferences(Constants.SETTINGS_NAME, 0);
+
+    // TODO: Get rid of selected and recording track IDs
+    long selectedTrackId = -1;
     if (preferences != null) {
       recordingTrackId =
           preferences.getLong(getString(R.string.recording_track_key), -1);
@@ -183,18 +185,18 @@ public class MyTracksWaypointsList extends ListActivity
     try {
       id = MyTracks.getInstance().insertWaypoint(request);
     } catch (RemoteException e) {
-      Log.e(MyTracksConstants.TAG, "Cannot insert marker.", e);
+      Log.e(Constants.TAG, "Cannot insert marker.", e);
       return;
     } catch (IllegalStateException e) {
-      Log.e(MyTracksConstants.TAG, "Cannot insert marker.", e);
+      Log.e(Constants.TAG, "Cannot insert marker.", e);
       return;
     }
     if (id < 0) {
-      Log.e(MyTracksConstants.TAG, "Failed to insert marker.");
+      Log.e(Constants.TAG, "Failed to insert marker.");
       return;
     }
-    Intent intent = new Intent(this, MyTracksWaypointDetails.class);
-    intent.putExtra(MyTracksWaypointDetails.WAYPOINT_ID_EXTRA, id);
+    Intent intent = new Intent(this, WaypointDetails.class);
+    intent.putExtra(WaypointDetails.WAYPOINT_ID_EXTRA, id);
     startActivity(intent);
   }
 
@@ -259,7 +261,7 @@ public class MyTracksWaypointsList extends ListActivity
           public void onClick(DialogInterface dialog, int i) {
             dialog.dismiss();
             providerUtils.deleteWaypoint(waypointId,
-                new StringUtils(MyTracksWaypointsList.this));
+                new StringUtils(WaypointsList.this));
           }
         });
     builder.setNegativeButton(getString(R.string.no),

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

@@ -15,7 +15,7 @@
  */
 package com.google.android.apps.mytracks;
 
-import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -82,6 +82,6 @@ public class WelcomeActivity extends Activity {
     AlertDialog dialog = builder.create();
     dialog.show();
     ((TextView) dialog.findViewById(R.id.about_version_register)).
-        setText(MyTracksUtils.getMyTracksVersion(this));
+        setText(SystemUtils.getMyTracksVersion(this));
   }
 }

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

@@ -0,0 +1,123 @@
+/*
+ * Copyright 2011 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;
+
+import com.google.android.apps.mytracks.io.file.TrackWriter;
+import com.google.android.maps.mytracks.R;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+
+/**
+ * Given a {@link TrackWriter}, this class manages the process of writing the
+ * data in the track represented by the writer.  This includes the display of
+ * a progress dialog, updating the progress bar in said dialog, and notifying
+ * interested parties when the write completes.
+ *
+ * @author Matthew Simmons
+ */
+class WriteProgressController {
+  /**
+   * This listener is used to notify interested parties when the write has
+   * completed.
+   */
+  public interface OnCompletionListener {
+    /**
+     * When this method is invoked, the write has completed, and the progress
+     * dialog has been dismissed.  Whether the write succeeded can be
+     * determined by examining the {@link TrackWriter}.
+     */
+    public void onComplete(TrackWriter writer);
+  }
+
+  private final Activity activity;
+  private final TrackWriter writer;
+  private final ProgressDialog dialog;
+
+  private OnCompletionListener onCompletionListener;
+
+  /**
+   * @param activity the activity associated with this write
+   * @param writer the writer which writes the track to disk.  Note that this
+   *     class will use the writer's completion listener.  If callers are
+   *     interested in notification upon completion of the write, they should
+   *     use {@link #setOnCompletionListener}.
+   */
+  public WriteProgressController(Activity activity, TrackWriter writer) {
+    this.activity = activity;
+    this.writer = writer;
+
+    dialog = new ProgressDialog(activity);
+    dialog.setIcon(android.R.drawable.ic_dialog_info);
+    dialog.setTitle(activity.getString(R.string.progress_title));
+    dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+    dialog.setMessage(activity.getString(R.string.write_progress_message));
+    dialog.setIndeterminate(true);
+    dialog.setOnCancelListener(dialogCancelListener);
+
+    writer.setOnCompletionListener(writerCompleteListener);
+    writer.setOnWriteListener(writerWriteListener);
+  }
+
+  /** Set a listener to be invoked when the write completes. */
+  public void setOnCompletionListener(OnCompletionListener onCompletionListener) {
+    this.onCompletionListener = onCompletionListener;
+  }
+
+  /** Initiate an asynchronous write. */
+  public void startWrite() {
+    DialogManager.showDialogSafely(activity, dialog);
+    writer.writeTrackAsync();
+  }
+
+  /** VisibleForTesting */
+  ProgressDialog getDialog() {
+    return dialog;
+  }
+
+  private final DialogInterface.OnCancelListener dialogCancelListener =
+    new DialogInterface.OnCancelListener() {
+      @Override
+      public void onCancel(DialogInterface dialog) {
+        writer.stopWriteTrack();
+      }
+    };
+
+  private final TrackWriter.OnCompletionListener writerCompleteListener =
+      new TrackWriter.OnCompletionListener() {
+        @Override
+        public void onComplete() {
+          DialogManager.dismissDialogSafely(activity, dialog);
+
+          if (onCompletionListener != null) {
+            onCompletionListener.onComplete(writer);
+          }
+        }
+      };
+
+  private final TrackWriter.OnWriteListener writerWriteListener =
+      new TrackWriter.OnWriteListener() {
+        @Override
+        public void onWrite(int number, int max) {
+          if (number % 500 == 0) {
+            dialog.setIndeterminate(false);
+            dialog.setMax(max);
+            dialog.setProgress(Math.min(number, max));
+          }
+        }
+      };
+}

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

@@ -0,0 +1,264 @@
+package com.google.android.apps.mytracks.content;
+
+import static com.google.android.apps.mytracks.Constants.TAG;
+
+import com.google.android.apps.mytracks.content.TrackDataHub.ListenerDataType;
+
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.database.ContentObserver;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.location.LocationProvider;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * External data source manager, which converts system-level events into My Tracks data events.
+ * 
+ * @author Rodrigo Damazio
+ */
+class DataSourceManager {
+
+  /** Single interface for receiving system events that were registered for. */
+  interface DataSourceListener {
+    void notifyTrackUpdated();
+    void notifyWaypointUpdated();
+    void notifyPointsUpdated();
+    void notifyPreferenceChanged(String key);
+    void notifyLocationProviderEnabled(boolean enabled);
+    void notifyLocationChanged(Location loc);
+    void notifyHeadingChanged(float heading);
+  }
+
+  private final DataSourceListener listener;
+
+  /** Observer for when the tracks table is updated. */
+  private class TrackObserver extends ContentObserver {
+    public TrackObserver() {
+      super(contentHandler);
+    }
+
+    @Override
+    public void onChange(boolean selfChange) {
+      listener.notifyTrackUpdated();
+    }
+  }
+
+  /** Observer for when the waypoints table is updated. */
+  private class WaypointObserver extends ContentObserver {
+    public WaypointObserver() {
+      super(contentHandler);
+    }
+
+    @Override
+    public void onChange(boolean selfChange) {
+      listener.notifyWaypointUpdated();
+    }
+  }
+
+  /** Observer for when the points table is updated. */
+  private class PointObserver extends ContentObserver {
+    public PointObserver() {
+      super(contentHandler);
+    }
+
+    @Override
+    public void onChange(boolean selfChange) {
+      listener.notifyPointsUpdated();
+    }
+  }
+
+  /** Listener for when preferences change. */
+  private class HubSharedPreferenceListener implements OnSharedPreferenceChangeListener {
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+      listener.notifyPreferenceChanged(key);
+    }
+  }
+
+  /** Listener for the current location (independent from track data). */
+  private class CurrentLocationListener implements
+      LocationListener {
+    @Override
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+      if (!LocationManager.GPS_PROVIDER.equals(provider)) return;
+
+      listener.notifyLocationProviderEnabled(status == LocationProvider.AVAILABLE);
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+      if (!LocationManager.GPS_PROVIDER.equals(provider)) return;
+
+      listener.notifyLocationProviderEnabled(true);
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
+      if (!LocationManager.GPS_PROVIDER.equals(provider)) return;
+
+      listener.notifyLocationProviderEnabled(false);
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+      listener.notifyLocationChanged(location);
+    }
+  }
+
+  /** Listener for compass readings. */
+  private class CompassListener implements
+      SensorEventListener {
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+      listener.notifyHeadingChanged(event.values[0]);
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+      // Do nothing
+    }
+  }
+
+  /** Wrapper for registering internal listeners. */
+  private final DataSourcesWrapper dataSources;
+
+  // Internal listeners (to receive data from the system)
+  private final Set<ListenerDataType> registeredListeners =
+      EnumSet.noneOf(ListenerDataType.class);
+  private final Handler contentHandler;
+  private final ContentObserver pointObserver;
+  private final ContentObserver waypointObserver;
+  private final ContentObserver trackObserver;
+  private final LocationListener locationListener;
+  private final OnSharedPreferenceChangeListener preferenceListener;
+  private final SensorEventListener compassListener;
+
+  DataSourceManager(DataSourceListener listener, DataSourcesWrapper dataSources) {
+    this.listener = listener;
+    this.dataSources = dataSources;
+
+    contentHandler = new Handler();
+    pointObserver = new PointObserver();
+    waypointObserver = new WaypointObserver();
+    trackObserver = new TrackObserver();
+
+    compassListener = new CompassListener();
+    locationListener = new CurrentLocationListener();
+    preferenceListener = new HubSharedPreferenceListener();
+  }
+
+  /** Updates the internal (sensor, position, etc) listeners. */
+  void updateAllListeners(EnumSet<ListenerDataType> externallyNeededListeners) {
+    EnumSet<ListenerDataType> neededListeners = EnumSet.copyOf(externallyNeededListeners);
+
+    // Special case - map sampled-out points type to points type since they
+    // correspond to the same internal listener.
+    if (neededListeners.contains(ListenerDataType.SAMPLED_OUT_POINT_UPDATES)) {
+      neededListeners.remove(ListenerDataType.SAMPLED_OUT_POINT_UPDATES);
+      neededListeners.add(ListenerDataType.POINT_UPDATES);
+    }
+    
+    Log.d(TAG, "Updating internal listeners to types " + neededListeners);
+
+    // Unnecessary = registered - needed
+    Set<ListenerDataType> unnecessaryListeners = EnumSet.copyOf(registeredListeners);
+    unnecessaryListeners.removeAll(neededListeners);
+
+    // Missing = needed - registered
+    Set<ListenerDataType> missingListeners = EnumSet.copyOf(neededListeners);
+    missingListeners.removeAll(registeredListeners);
+
+    // Remove all unnecessary listeners.
+    for (ListenerDataType type : unnecessaryListeners) {
+      unregisterListener(type);
+    }
+
+    // Add all missing listeners.
+    for (ListenerDataType type : missingListeners) {
+      registerListener(type);
+    }
+
+    // Now all needed types are registered.
+    registeredListeners.clear();
+    registeredListeners.addAll(neededListeners);
+  }
+
+  private void registerListener(ListenerDataType type) {
+    switch (type) {
+      case COMPASS_UPDATES: {
+        // Listen to compass
+        Sensor compass = dataSources.getSensor(Sensor.TYPE_ORIENTATION);
+        if (compass != null) {
+          Log.d(TAG, "TrackDataHub: Now registering sensor listener.");
+          dataSources.registerSensorListener(compassListener, compass, SensorManager.SENSOR_DELAY_UI);
+        }
+        break;
+      }
+      case LOCATION_UPDATES:
+        dataSources.requestLocationUpdates(locationListener);
+        break;
+      case POINT_UPDATES:
+        dataSources.registerContentObserver(
+            TrackPointsColumns.CONTENT_URI, false, pointObserver);
+        break;
+      case TRACK_UPDATES:
+        dataSources.registerContentObserver(TracksColumns.CONTENT_URI, false, trackObserver);
+        break;
+      case WAYPOINT_UPDATES:
+        dataSources.registerContentObserver(
+            WaypointsColumns.CONTENT_URI, false, waypointObserver);
+        break;
+      case DISPLAY_PREFERENCES:
+        dataSources.registerOnSharedPreferenceChangeListener(preferenceListener);
+        break;
+      case SAMPLED_OUT_POINT_UPDATES:
+        throw new IllegalArgumentException("Should have been mapped to point updates");
+    }
+  }
+
+  private void unregisterListener(ListenerDataType type) {
+    switch (type) {
+      case COMPASS_UPDATES:
+        dataSources.unregisterSensorListener(compassListener);
+        break;
+      case LOCATION_UPDATES:
+        dataSources.removeLocationUpdates(locationListener);
+        break;
+      case POINT_UPDATES:
+        dataSources.unregisterContentObserver(pointObserver);
+        break;
+      case TRACK_UPDATES:
+        dataSources.unregisterContentObserver(trackObserver);
+        break;
+      case WAYPOINT_UPDATES:
+        dataSources.unregisterContentObserver(waypointObserver);
+        break;
+      case DISPLAY_PREFERENCES:
+        dataSources.unregisterOnSharedPreferenceChangeListener(preferenceListener);
+        break;
+      case SAMPLED_OUT_POINT_UPDATES:
+        throw new IllegalArgumentException("Should have been mapped to point updates");
+    }
+  }
+
+  /** Unregisters all internal (sensor, position, etc.) listeners. */
+  void unregisterAllListeners() {
+    dataSources.removeLocationUpdates(locationListener);
+    dataSources.unregisterSensorListener(compassListener);
+    dataSources.unregisterContentObserver(trackObserver);
+    dataSources.unregisterContentObserver(waypointObserver);
+    dataSources.unregisterContentObserver(pointObserver);
+    dataSources.unregisterOnSharedPreferenceChangeListener(preferenceListener);
+  }
+}

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2011 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 android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.database.ContentObserver;
+import android.hardware.Sensor;
+import android.hardware.SensorEventListener;
+import android.location.Location;
+import android.location.LocationListener;
+import android.net.Uri;
+
+/**
+ * Interface for abstracting registration of external data source listeners.
+ *
+ * @author Rodrigo Damazio
+ */
+interface DataSourcesWrapper {
+  // Preferences
+  void registerOnSharedPreferenceChangeListener(
+      OnSharedPreferenceChangeListener listener);
+  void unregisterOnSharedPreferenceChangeListener(
+      OnSharedPreferenceChangeListener listener);
+
+  // Content provider
+  void registerContentObserver(Uri contentUri, boolean descendents,
+      ContentObserver observer);
+  void unregisterContentObserver(ContentObserver observer);
+
+  // Sensors
+  Sensor getSensor(int type);
+  void registerSensorListener(SensorEventListener listener,
+      Sensor sensor, int sensorDelay);
+  void unregisterSensorListener(SensorEventListener listener);
+
+  // Location
+  boolean isLocationProviderEnabled(String provider);
+  void requestLocationUpdates(LocationListener listener);
+  void removeLocationUpdates(LocationListener listener);
+  Location getLastKnownLocation();
+} 

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

@@ -0,0 +1,166 @@
+/*
+ * Copyright 2011 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 static com.google.android.apps.mytracks.Constants.MAX_LOCATION_AGE_MS;
+import static com.google.android.apps.mytracks.Constants.MAX_NETWORK_AGE_MS;
+
+import com.google.android.apps.mytracks.Constants;
+import com.google.android.maps.mytracks.R;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.database.ContentObserver;
+import android.hardware.Sensor;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.location.LocationProvider;
+import android.net.Uri;
+import android.util.Log;
+import android.widget.Toast;
+
+/**
+ * Real implementation of the data sources, which talks to system services.
+ *
+ * @author Rodrigo Damazio
+ */
+class DataSourcesWrapperImpl implements DataSourcesWrapper {
+  // System services
+  private final SensorManager sensorManager;
+  private final LocationManager locationManager;
+  private final ContentResolver contentResolver;
+  private final SharedPreferences sharedPreferences;
+  private final Context context;
+
+  DataSourcesWrapperImpl(Context context, SharedPreferences sharedPreferences) {
+    this.context = context;
+    this.sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+    this.locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+    this.contentResolver = context.getContentResolver();
+    this.sharedPreferences = sharedPreferences;
+  }
+
+  @Override
+  public void registerOnSharedPreferenceChangeListener(
+      OnSharedPreferenceChangeListener listener) {
+    sharedPreferences.registerOnSharedPreferenceChangeListener(listener);
+  }
+
+  @Override
+  public void unregisterOnSharedPreferenceChangeListener(
+      OnSharedPreferenceChangeListener listener) {
+    sharedPreferences.unregisterOnSharedPreferenceChangeListener(listener);
+  }
+
+  @Override
+  public void registerContentObserver(Uri contentUri, boolean descendents,
+      ContentObserver observer) {
+    contentResolver.registerContentObserver(contentUri, descendents, observer);
+  }
+
+  @Override
+  public void unregisterContentObserver(ContentObserver observer) {
+    contentResolver.unregisterContentObserver(observer);
+  }
+
+  @Override
+  public Sensor getSensor(int type) {
+    return sensorManager.getDefaultSensor(type);
+  }
+
+  @Override
+  public void registerSensorListener(SensorEventListener listener,
+      Sensor sensor, int sensorDelay) {
+    sensorManager.registerListener(listener, sensor, sensorDelay);
+  }
+
+  @Override
+  public void unregisterSensorListener(SensorEventListener listener) {
+    sensorManager.unregisterListener(listener);
+  }
+
+  @Override
+  public boolean isLocationProviderEnabled(String provider) {
+    return locationManager.isProviderEnabled(provider);
+  }
+
+  @Override
+  public void requestLocationUpdates(LocationListener listener) {
+    // Check if the provider exists.
+    LocationProvider gpsProvider = locationManager.getProvider(LocationManager.GPS_PROVIDER);
+    if (gpsProvider == null) {
+      listener.onProviderDisabled(LocationManager.GPS_PROVIDER);
+      locationManager.removeUpdates(listener);
+      return;
+    }
+
+    // Listen to GPS location.
+    String providerName = gpsProvider.getName();
+    Log.d(Constants.TAG, "TrackDataHub: Using location provider " + providerName);
+    locationManager.requestLocationUpdates(providerName,
+        0 /*minTime*/, 0 /*minDist*/, listener);
+
+    // Give an initial update on provider state.
+    if (locationManager.isProviderEnabled(providerName)) {
+      listener.onProviderEnabled(providerName);
+    } else {
+      listener.onProviderDisabled(providerName);
+    }
+
+    // Listen to network location
+    try {
+      locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER,
+          1000 * 60 * 5 /*minTime*/, 0 /*minDist*/, listener);
+    } catch (RuntimeException e) {
+      // If anything at all goes wrong with getting a cell location do not
+      // abort. Cell location is not essential to this app.
+      Log.w(Constants.TAG, "Could not register network location listener.", e);
+    }
+  }
+
+  @Override
+  public Location getLastKnownLocation() {
+    // TODO: Let's look at more advanced algorithms to determine the best
+    // current location.
+
+    Location loc = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+    final long now = System.currentTimeMillis();
+    if (loc == null || loc.getTime() < now - MAX_LOCATION_AGE_MS) {
+      // We don't have a recent GPS fix, just use cell towers if available
+      loc = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
+
+      int toastResId = R.string.status_approximate_location;
+      if (loc == null || loc.getTime() < now - MAX_NETWORK_AGE_MS) {
+        // We don't have a recent cell tower location, let the user know:
+        toastResId = R.string.status_no_location;
+      }
+
+      // Let the user know we have only an approximate location:
+     Toast.makeText(context, context.getString(toastResId), Toast.LENGTH_LONG).show();
+    }
+    return loc;
+  }
+
+  @Override
+  public void removeLocationUpdates(LocationListener listener) {
+    locationManager.removeUpdates(listener);
+  }
+}

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

@@ -15,7 +15,7 @@
  */
 package com.google.android.apps.mytracks.content;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.util.ApiFeatures;
 
 import android.content.ContentProvider;
@@ -193,12 +193,14 @@ public class MyTracksProvider extends ContentProvider {
   @Override
   public int delete(Uri url, String where, String[] selectionArgs) {
     String table;
+    boolean shouldVacuum = false;
     switch (urlMatcher.match(url)) {
       case TRACKPOINTS:
         table = TRACKPOINTS_TABLE;
         break;
       case TRACKS:
         table = TRACKS_TABLE;
+        shouldVacuum = true;
         break;
       case WAYPOINTS:
         table = WAYPOINTS_TABLE;
@@ -210,6 +212,13 @@ public class MyTracksProvider extends ContentProvider {
     Log.w(MyTracksProvider.TAG, "provider delete in " + table + "!");
     int count = db.delete(table, where, selectionArgs);
     getContext().getContentResolver().notifyChange(url, null, true);
+
+    if (shouldVacuum) {
+      // If a potentially large amount of data was deleted, we want to reclaim its space.
+      Log.i(TAG, "Vacuuming the database");
+      db.execSQL("VACUUM");
+    }
+
     return count;
   }
 
@@ -373,7 +382,7 @@ public class MyTracksProvider extends ContentProvider {
     }
 
     if (ApiFeatures.getInstance().canReuseSQLiteQueryBuilder()) {
-      Log.i(MyTracksConstants.TAG,
+      Log.i(Constants.TAG,
           "Build query: " + qb.buildQuery(projection, selection, selectionArgs, 
           null, null, sortOrder, null));
     }

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

@@ -0,0 +1,150 @@
+/*
+ * Copyright 2011 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.content.Track;
+import com.google.android.apps.mytracks.content.Waypoint;
+
+import android.location.Location;
+
+/**
+ * Listener for track data, for both initial and incremental loading.
+ *
+ * @author Rodrigo Damazio
+ */
+public interface TrackDataListener {
+
+  /** States for the GPS location provider. */
+  public enum ProviderState {
+    DISABLED,
+    NO_FIX,
+    BAD_FIX,
+    GOOD_FIX;
+  }
+
+  /**
+   * Called when the location provider changes state.
+   */
+  void onProviderStateChange(ProviderState state);
+
+  /**
+   * Called when the current location changes.
+   * This is meant for immediate location display only - track point data is
+   * delivered by other methods below, such as {@link #onNewTrackPoint}.
+   *
+   * @param loc the last known location
+   */
+  void onCurrentLocationChanged(Location loc);
+
+  /**
+   * Called when the current heading changes.
+   *
+   * @param heading the current heading, already accounting magnetic declination
+   */
+  void onCurrentHeadingChanged(double heading);
+
+  /**
+   * Called when the currently-selected track changes.
+   * This will be followed by calls to data methods such as
+   * {@link #onTrackUpdated}, {@link #clearTrackPoints},
+   * {@link #onNewTrackPoint(Location)}, etc., even if no track is currently
+   * selected (in which case you'll only get calls to clear the current data).
+   * 
+   * @param track the selected track, or null if no track is selected
+   * @param isRecording whether we're currently recording the selected track
+   */
+  void onSelectedTrackChanged(Track track, boolean isRecording);
+
+  /**
+   * Called when the track and/or its statistics have been updated.
+   *
+   * @param track the updated version of the track
+   */
+  void onTrackUpdated(Track track);
+
+  /**
+   * Called to clear any previously-sent track points.
+   * This can be called at any time that we decide the data needs to be
+   * reloaded, such as when it needs to be resampled.
+   */
+  void clearTrackPoints();
+
+  /**
+   * Called when a new interesting track point is read.
+   * In this case, interesting means that the point has already undergone
+   * sampling and invalid point filtering.
+   *
+   * @param loc the new track point
+   */
+  void onNewTrackPoint(Location loc);
+
+  /**
+   * Called when a uninteresting track point is read.
+   * Uninteresting points are all points that get sampled out of the track.
+   *
+   * @param loc the new track point
+   */
+  void onSampledOutTrackPoint(Location loc);
+
+  /**
+   * Called when an invalid point (representing a segment split) is read.
+   */
+  void onSegmentSplit();
+
+  /**
+   * Called when we're done (for the time being) sending new points.
+   * This gets called after every batch of calls to {@link #onNewTrackPoint},
+   * {@link #onSampledOutTrackPoint} and {@link #onSegmentSplit}.
+   */
+  void onNewTrackPointsDone();
+
+  /**
+   * Called to clear any previously-sent waypoints.
+   * This can be called at any time that we decide the data needs to be
+   * reloaded.
+   */
+  void clearWaypoints();
+
+  /**
+   * Called when a new waypoint is read.
+   *
+   * @param wpt the new waypoint
+   */
+  void onNewWaypoint(Waypoint wpt);
+
+  /**
+   * Called when we're done (for the time being) sending new waypoints.
+   * This gets called after every batch of calls to {@link #clearWaypoints} and
+   * {@link #onNewWaypoint}.
+   */
+  void onNewWaypointsDone();
+
+  /**
+   * Called when the display units are changed by the user.
+   *
+   * @param metric true if the units are metric, false if imperial
+   * @return true to reload all the data, false otherwise
+   */
+  boolean onUnitsChanged(boolean metric);
+
+  /**
+   * Called when the speed/pace display unit is changed by the user.
+   *
+   * @param reportSpeed true to report speed, false for pace
+   * @return true to reload all the data, false otherwise
+   */
+  boolean onReportSpeedChanged(boolean reportSpeed);
+}

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

@@ -0,0 +1,170 @@
+/*
+ * Copyright 2011 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 static com.google.android.apps.mytracks.Constants.TAG;
+
+import com.google.android.apps.mytracks.content.TrackDataHub.ListenerDataType;
+
+import android.util.Log;
+
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+
+/**
+ * Manager for the external data listeners and their listening types.
+ *
+ * @author Rodrigo Damazio
+ */
+class TrackDataListeners {
+
+  /** Internal representation of a listener's registration. */
+  static class ListenerRegistration {
+    final TrackDataListener listener;
+    final EnumSet<ListenerDataType> types;
+
+    // State that was last notified to the listener, for resuming after a pause.
+    long lastTrackId;
+    long lastPointId;
+    int lastSamplingFrequency;
+    int numLoadedPoints;
+
+    public ListenerRegistration(TrackDataListener listener,
+        EnumSet<ListenerDataType> types) {
+      this.listener = listener;
+      this.types = types;
+    }
+
+    public boolean isInterestedIn(ListenerDataType type) {
+      return types.contains(type);
+    }
+
+    @Override
+    public String toString() {
+      return "ListenerRegistration [listener=" + listener + ", types=" + types
+          + ", lastTrackId=" + lastTrackId + ", lastPointId=" + lastPointId
+          + ", lastSamplingFrequency=" + lastSamplingFrequency
+          + ", numLoadedPoints=" + numLoadedPoints + "]";
+    }
+  }
+
+  /** Map of external listener to its registration details. */
+  private final Map<TrackDataListener, ListenerRegistration> registeredListeners =
+      new HashMap<TrackDataListener, ListenerRegistration>();
+
+  /**
+   * Map of external paused listener to its registration details.
+   * This will automatically discard listeners which are GCed.
+   */
+  private final WeakHashMap<TrackDataListener, ListenerRegistration> oldListeners =
+      new WeakHashMap<TrackDataListener, ListenerRegistration>();
+
+  /** Map of data type to external listeners interested in it. */
+  private final Map<ListenerDataType, Set<TrackDataListener>> listenerSetsPerType =
+      new EnumMap<ListenerDataType, Set<TrackDataListener>>(ListenerDataType.class);
+
+  public TrackDataListeners() {
+    // Create sets for all data types at startup.
+    for (ListenerDataType type : ListenerDataType.values()) {
+      listenerSetsPerType.put(type, new LinkedHashSet<TrackDataListener>());
+    }
+  }
+
+  /**
+   * Registers a listener to send data to.
+   * It is ok to call this method before {@link start}, and in that case
+   * the data will only be passed to listeners when {@link start} is called.
+   *
+   * @param listener the listener to register
+   * @param dataTypes the type of data that the listener is interested in
+   */
+  public ListenerRegistration registerTrackDataListener(final TrackDataListener listener, EnumSet<ListenerDataType> dataTypes) {
+    Log.d(TAG, "Registered track data listener: " + listener);
+    if (registeredListeners.containsKey(listener)) {
+      throw new IllegalStateException("Listener already registered");
+    }
+
+    ListenerRegistration registration = oldListeners.remove(listener);
+    if (registration == null) {
+      registration = new ListenerRegistration(listener, dataTypes);
+    }
+    registeredListeners.put(listener, registration);
+
+    for (ListenerDataType type : dataTypes) {
+      // This is guaranteed not to be null.
+      Set<TrackDataListener> typeSet = listenerSetsPerType.get(type);
+      typeSet.add(listener);
+    }
+
+    return registration;
+  }
+
+  /**
+   * Unregisters a listener to send data to.
+   *
+   * @param listener the listener to unregister
+   */
+  public void unregisterTrackDataListener(TrackDataListener listener) {
+    Log.d(TAG, "Unregistered track data listener: " + listener);
+    // Remove and keep the corresponding registration.
+    ListenerRegistration match = registeredListeners.remove(listener);
+    if (match == null) {
+      Log.w(TAG, "Tried to unregister listener which is not registered.");
+      return;
+    }
+
+    // Remove it from the per-type sets
+    for (ListenerDataType type : match.types) {
+      listenerSetsPerType.get(type).remove(listener);
+    }
+
+    // Keep it around in case it's re-registered soon
+    oldListeners.put(listener, match);
+  }
+
+  public ListenerRegistration getRegistration(TrackDataListener listener) {
+    ListenerRegistration registration = registeredListeners.get(listener);
+    if (registration == null) {
+      registration = oldListeners.get(listener);
+    }
+    return registration;
+  }
+
+  public Set<TrackDataListener> getListenersFor(ListenerDataType type) {
+    return listenerSetsPerType.get(type);
+  }
+
+  public EnumSet<ListenerDataType> getAllRegisteredTypes() {
+    EnumSet<ListenerDataType> listeners = EnumSet.noneOf(ListenerDataType.class);
+    for (ListenerRegistration registration : this.registeredListeners.values()) {
+      listeners.addAll(registration.types);
+    }
+    return listeners;
+  }
+
+  public boolean hasListeners() {
+    return !registeredListeners.isEmpty();
+  }
+
+  public int getNumListeners() {
+    return registeredListeners.size();
+  }
+}

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

@@ -15,7 +15,7 @@
  */
 package com.google.android.apps.mytracks.io;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.Constants;
 
 import android.app.Activity;
 import android.os.Build;
@@ -46,11 +46,11 @@ public class AuthManagerFactory {
   public static AuthManager getAuthManager(Activity activity, int code,
       Bundle extras, boolean requireGoogle, String service) {
     if (useModernAuthManager()) {
-      Log.i(MyTracksConstants.TAG,
+      Log.i(Constants.TAG,
           "Creating modern auth manager: " + service);
       return new ModernAuthManager(activity, code, extras, requireGoogle, service);
     } else {
-      Log.i(MyTracksConstants.TAG,
+      Log.i(Constants.TAG,
           "Creating legacy auth manager: " + service);
       return new AuthManagerOld(activity, code, extras, requireGoogle, service);
     }

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

@@ -23,7 +23,7 @@ import com.google.android.accounts.AuthenticatorException;
 import com.google.android.accounts.OperationCanceledException;
 import com.google.android.apps.mytracks.AccountChooser;
 import com.google.android.apps.mytracks.MyTracks;
-import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.Constants;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -104,20 +104,20 @@ public class ModernAuthManager implements AuthManager {
             if (result.containsKey(AccountManager.KEY_INTENT)) {
               Intent intent = (Intent) result.get(AccountManager.KEY_INTENT);
               clearNewTaskFlag(intent);
-              activity.startActivityForResult(intent, MyTracksConstants.GET_LOGIN);
+              activity.startActivityForResult(intent, Constants.GET_LOGIN);
               return;
             }
 
             authToken = result.getString(
                 AccountManager.KEY_AUTHTOKEN);
-            Log.e(MyTracksConstants.TAG, "Got auth token.");
+            Log.e(Constants.TAG, "Got auth token.");
             runWhenFinished();
           } catch (OperationCanceledException e) {
-            Log.e(MyTracksConstants.TAG, "Operation Canceled", e);
+            Log.e(Constants.TAG, "Operation Canceled", e);
           } catch (IOException e) {
-            Log.e(MyTracksConstants.TAG, "IOException", e);
+            Log.e(Constants.TAG, "IOException", e);
           } catch (AuthenticatorException e) {
-            Log.e(MyTracksConstants.TAG, "Authentication Failed", e);
+            Log.e(Constants.TAG, "Authentication Failed", e);
           }
         }
     }, null /* handler */);
@@ -149,9 +149,9 @@ public class ModernAuthManager implements AuthManager {
     if (results != null) {
       authToken = results.getStringExtra(
           AccountManager.KEY_AUTHTOKEN);
-      Log.w(MyTracksConstants.TAG, "authResult: " + authToken);
+      Log.w(Constants.TAG, "authResult: " + authToken);
     } else {
-      Log.e(MyTracksConstants.TAG, "No auth result results!!");
+      Log.e(Constants.TAG, "No auth result results!!");
     }
     runWhenFinished();
     return authToken != null;
@@ -181,7 +181,7 @@ public class ModernAuthManager implements AuthManager {
 
     activity.runOnUiThread(new Runnable() {
       public void run() {
-        accountManager.invalidateAuthToken(MyTracksConstants.ACCOUNT_TYPE,
+        accountManager.invalidateAuthToken(Constants.ACCOUNT_TYPE,
             authToken);
         MyTracks.getInstance().getAccountChooser().chooseAccount(activity,
             new AccountChooser.AccountHandler() {

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

@@ -1,68 +0,0 @@
-package com.google.android.apps.mytracks.io;
-
-import com.google.android.apps.mytracks.io.gdata.GDataClientFactory;
-import com.google.android.apps.mytracks.io.mymaps.MapsFacade;
-import com.google.android.apps.mytracks.io.mymaps.MapsService;
-import com.google.android.apps.mytracks.io.mymaps.MapsStringsProvider;
-import com.google.android.apps.mytracks.io.mymaps.MapsFacade.AuthenticationRefresher;
-import com.google.android.maps.mytracks.R;
-
-import android.app.Activity;
-import android.content.Context;
-
-/**
- * Factory to easily instantiate a {@link MapsFacade}.
- *
- * @author Rodrigo Damazio
- */
-public class MyMapsFactory {
-
-  /**
-   * Simple provider for reading strings from resources.
-   */
-  private static class MyMapsStringProvider implements MapsStringsProvider {
-    private final Context context;
-
-    public MyMapsStringProvider(Context context) {
-      this.context = context;
-    }
-
-    @Override
-    public String getNewMapDescription() {
-      return context.getString(R.string.new_map_description);
-    }
-
-    @Override
-    public String getStart() {
-      return context.getString(R.string.start);
-    }
-
-    @Override
-    public String getEnd() {
-      return context.getString(R.string.end);
-    }
-  }
-
-  /**
-   * Creates a new Maps fa�ade interface instance.
-   *
-   * @param context current context
-   * @param auth a valid authentication manager
-   * @return the fa�ade
-   */
-  public static MapsFacade newMapsClient(Activity context, final AuthManager auth) {
-    MapsFacade client = MapsService.newClient(context,
-        GDataClientFactory.getGDataClient(context),
-        new MyMapsStringProvider(context),
-        auth.getAuthToken());
-    client.setAuthenticationRefresher(new AuthenticationRefresher() {
-      @Override
-      public void invalidateAndRefresh(Runnable done) {
-        auth.invalidateAndRefresh(done);
-      }
-    });
-    return client;
-  }
-
-  private MyMapsFactory() {}
-}

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

@@ -16,8 +16,7 @@
 package com.google.android.apps.mytracks.io;
 
 import com.google.android.apps.mytracks.MyTracks;
-import com.google.android.apps.mytracks.MyTracksConstants;
-import com.google.android.apps.mytracks.MyTracksSettings;
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.io.docs.DocsHelper;
@@ -73,7 +72,7 @@ public class SendToDocs {
     this.trackId = trackId;
 
     SharedPreferences preferences = activity.getSharedPreferences(
-        MyTracksSettings.SETTINGS_NAME, 0);
+        Constants.SETTINGS_NAME, 0);
     if (preferences != null) {
       metricUnits =
           preferences.getBoolean(activity.getString(R.string.metric_units_key),
@@ -82,7 +81,7 @@ public class SendToDocs {
       metricUnits = true;
     }
 
-    Log.d(MyTracksConstants.TAG,
+    Log.d(Constants.TAG,
         "Sending to Google Docs: trackId = " + trackId);
     handlerThread = new HandlerThread("SendToGoogleDocs");
     handlerThread.start();
@@ -105,7 +104,7 @@ public class SendToDocs {
 
     try {
       if (trackId == -1) {
-        Log.w(MyTracksConstants.TAG, "Cannot get track id.");
+        Log.w(Constants.TAG, "Cannot get track id.");
         return;
       }
 
@@ -113,14 +112,14 @@ public class SendToDocs {
       Track track =
           MyTracksProviderUtils.Factory.get(activity).getTrack(trackId);
       if (track == null) {
-        Log.w(MyTracksConstants.TAG, "Cannot get track.");
+        Log.w(Constants.TAG, "Cannot get track.");
         return;
       }
 
       // Transmit track stats via GData feed:
       // -------------------------------
 
-      Log.d(MyTracksConstants.TAG, "SendToDocs: Uploading to spreadsheet");
+      Log.d(Constants.TAG, "SendToDocs: Uploading to spreadsheet");
       success = uploadToDocs(track);
       if (success) {
         if (createdNewSpreadSheet) {
@@ -133,7 +132,7 @@ public class SendToDocs {
       } else {
         statusMessage = activity.getString(R.string.error_sending_to_docs);
       }
-      Log.d(MyTracksConstants.TAG, "SendToDocs: Done.");
+      Log.d(Constants.TAG, "SendToDocs: Done.");
     } finally {
       if (onCompletion != null) {
         activity.runOnUiThread(onCompletion);
@@ -176,7 +175,7 @@ public class SendToDocs {
       SpreadsheetsClient gdataClient = new SpreadsheetsClient(androidClient,
           new XmlDocsGDataParserFactory(new AndroidXmlParserFactory()));
       trixWrapper.setClient(gdataClient);
-      Log.d(MyTracksConstants.TAG,
+      Log.d(Constants.TAG,
           "GData connection prepared: " + this.docListAuth);
       String sheetTitle = "My Tracks";
 
@@ -194,7 +193,7 @@ public class SendToDocs {
         spreadsheetId = docsHelper.requestSpreadsheetId(docListWrapper, 
             sheetTitle);
       } catch (IOException e) {
-        Log.i(MyTracksConstants.TAG, "Spreadsheet lookup failed.", e);
+        Log.i(Constants.TAG, "Spreadsheet lookup failed.", e);
         return false;
       }
 
@@ -205,14 +204,14 @@ public class SendToDocs {
         try {
           Thread.sleep(5000);
         } catch (InterruptedException e) {
-          Log.e(MyTracksConstants.TAG, "Sleep interrupted", e);
+          Log.e(Constants.TAG, "Sleep interrupted", e);
         }
         
         try {
           spreadsheetId = docsHelper.requestSpreadsheetId(docListWrapper, 
               sheetTitle);
         } catch (IOException e) {
-          Log.i(MyTracksConstants.TAG, "2nd spreadsheet lookup failed.", e);
+          Log.i(Constants.TAG, "2nd spreadsheet lookup failed.", e);
           return false;
         }
       }
@@ -220,13 +219,13 @@ public class SendToDocs {
       // We were unable to find an existing spreadsheet, so create a new one.
       MyTracks.getInstance().setProgressValue(70);
       if (spreadsheetId == null) {
-        Log.i(MyTracksConstants.TAG, "Creating new spreadsheet: " + sheetTitle);
+        Log.i(Constants.TAG, "Creating new spreadsheet: " + sheetTitle);
 
         try {
           spreadsheetId = docsHelper.createSpreadsheet(activity, docListWrapper,
               sheetTitle);
         } catch (IOException e) {
-          Log.i(MyTracksConstants.TAG, "Failed to create new spreadsheet "
+          Log.i(Constants.TAG, "Failed to create new spreadsheet "
               + sheetTitle, e);
           return false;
         }
@@ -239,19 +238,19 @@ public class SendToDocs {
           // reported an error. Seems to be a know bug,
           // see http://code.google.com/p/gdata-issues/issues/detail?id=929
           // Try to find the created spreadsheet:
-          Log.w(MyTracksConstants.TAG,
+          Log.w(Constants.TAG,
               "Create might have failed. Trying to find created document.");
           try {
             Thread.sleep(5000);
           } catch (InterruptedException e) {
-            Log.e(MyTracksConstants.TAG, "Sleep interrupted", e);
+            Log.e(Constants.TAG, "Sleep interrupted", e);
           }
 
           try {
             spreadsheetId = docsHelper.requestSpreadsheetId(docListWrapper, 
                 sheetTitle);
           } catch (IOException e) {
-            Log.i(MyTracksConstants.TAG, "Failed create-failed lookup", e);
+            Log.i(Constants.TAG, "Failed create-failed lookup", e);
             return false;
           }
 
@@ -261,19 +260,19 @@ public class SendToDocs {
             try {
               Thread.sleep(5000);
             } catch (InterruptedException e) {
-              Log.e(MyTracksConstants.TAG, "Sleep interrupted", e);
+              Log.e(Constants.TAG, "Sleep interrupted", e);
             }
             
             try {
               spreadsheetId = docsHelper.requestSpreadsheetId(docListWrapper, 
                   sheetTitle);
             } catch (IOException e) {
-              Log.i(MyTracksConstants.TAG, "Failed create-failed relookup", e);
+              Log.i(Constants.TAG, "Failed create-failed relookup", e);
               return false;
             }
           }
           if (spreadsheetId == null) {
-            Log.i(MyTracksConstants.TAG,
+            Log.i(Constants.TAG,
                 "Creating new spreadsheet really failed.");
             return false;
           }
@@ -287,7 +286,7 @@ public class SendToDocs {
           throw new IOException("Worksheet ID lookup returned empty");
         }
       } catch (IOException e) {
-        Log.i(MyTracksConstants.TAG, "Looking up worksheet id failed.", e);
+        Log.i(Constants.TAG, "Looking up worksheet id failed.", e);
         return false;
       }
 
@@ -295,9 +294,9 @@ public class SendToDocs {
 
       docsHelper.addTrackRow(activity, trixAuth, spreadsheetId, worksheetId, 
           track, metricUnits);
-      Log.i(MyTracksConstants.TAG, "Done uploading to docs.");
+      Log.i(Constants.TAG, "Done uploading to docs.");
     } catch (IOException e) {
-      Log.e(MyTracksConstants.TAG, "Unable to upload docs.", e);
+      Log.e(Constants.TAG, "Unable to upload docs.", e);
       return false;
     } finally {
       if (androidClient != null) {

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

@@ -15,8 +15,7 @@
  */
 package com.google.android.apps.mytracks.io;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
-import com.google.android.apps.mytracks.MyTracksSettings;
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.ProgressIndicator;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
@@ -25,8 +24,9 @@ import com.google.android.apps.mytracks.io.gdata.GDataWrapper;
 import com.google.android.apps.mytracks.io.gdata.GDataWrapper.QueryFunction;
 import com.google.android.apps.mytracks.stats.DoubleBuffer;
 import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.apps.mytracks.util.StringUtils;
+import com.google.android.apps.mytracks.util.SystemUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
 import com.google.api.client.googleapis.GoogleHeaders;
@@ -141,7 +141,7 @@ public class SendToFusionTables implements Runnable {
     this.providerUtils = MyTracksProviderUtils.Factory.get(context);
 
     GoogleHeaders headers = new GoogleHeaders();
-    headers.setApplicationName("Google-MyTracks-" + MyTracksUtils.getMyTracksVersion(context));
+    headers.setApplicationName("Google-MyTracks-" + SystemUtils.getMyTracksVersion(context));
     headers.gdataVersion = GDATA_VERSION;
 
     transport = new HttpTransport();
@@ -151,7 +151,7 @@ public class SendToFusionTables implements Runnable {
 
   @Override
   public void run() {
-    Log.d(MyTracksConstants.TAG, "Sending to Fusion tables: trackId = " + trackId);
+    Log.d(Constants.TAG, "Sending to Fusion tables: trackId = " + trackId);
     doUpload();
   }
 
@@ -172,7 +172,7 @@ public class SendToFusionTables implements Runnable {
   private void doUpload() {
     ((GoogleHeaders) transport.defaultHeaders).setGoogleLogin(auth.getAuthToken());
     int statusMessageId = R.string.error_sending_to_fusiontables;
-    boolean success = false;
+    boolean success = true;
     try {
       progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
       progressIndicator.setProgressMessage(R.string.progress_message_reading_track);
@@ -204,11 +204,10 @@ public class SendToFusionTables implements Runnable {
       }
 
       statusMessageId = R.string.status_new_fusiontable_has_been_created;
-      success = true;
-      Log.d(MyTracksConstants.TAG, "SendToFusionTables: Done: " + success);
+      Log.d(Constants.TAG, "SendToFusionTables: Done: " + success);
       progressIndicator.setProgressValue(PROGRESS_COMPLETE);
-
     } finally {
+
       final boolean finalSuccess = success;
       final int finalStatusMessageId = statusMessageId;
       context.runOnUiThread(new Runnable() {
@@ -229,14 +228,14 @@ public class SendToFusionTables implements Runnable {
    * @return true in case of success.
    */
   private boolean createNewTable(Track track) {
-    Log.d(MyTracksConstants.TAG, "Creating a new fusion table.");
+    Log.d(Constants.TAG, "Creating a new fusion table.");
     String query = "CREATE TABLE '" + sqlEscape(track.getName()) +
         "' (name:STRING,description:STRING,geometry:LOCATION,marker:STRING)";
     return runUpdate(query);
   }
 
   private boolean makeTableUnlisted(String tableId) {
-    Log.d(MyTracksConstants.TAG, "Setting visibility to unlisted.");
+    Log.d(Constants.TAG, "Setting visibility to unlisted.");
     String query = "UPDATE TABLE " + tableId + " SET VISIBILITY = UNLISTED";
     return runUpdate(query);
   }
@@ -275,7 +274,7 @@ public class SendToFusionTables implements Runnable {
    */
   private boolean createNewPoint(String name, String description, Location location,
       String marker) {
-    Log.d(MyTracksConstants.TAG, "Creating a new row with a point.");
+    Log.d(Constants.TAG, "Creating a new row with a point.");
     String query = "INSERT INTO " + tableId + " (name,description,geometry,marker) VALUES "
         + values(name, description, getKmlPoint(location), marker);
     return runUpdate(query);
@@ -288,7 +287,7 @@ public class SendToFusionTables implements Runnable {
    * @return true in case of success.
    */
   private boolean createNewLineString(Track track) {
-    Log.d(MyTracksConstants.TAG, "Creating a new row with a point.");
+    Log.d(Constants.TAG, "Creating a new row with a point.");
     String query = "INSERT INTO " + tableId
         + " (name,description,geometry) VALUES "
         + values(track.getName(), track.getDescription(), getKmlLineString(track));
@@ -297,7 +296,7 @@ public class SendToFusionTables implements Runnable {
 
   private boolean uploadAllTrackPoints(final Track track, String originalDescription) {
 
-    SharedPreferences preferences = context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+    SharedPreferences preferences = context.getSharedPreferences(Constants.SETTINGS_NAME, 0);
     boolean metricUnits = true;
     if (preferences != null) {
       metricUnits = preferences.getBoolean(context.getString(R.string.metric_units_key), true);
@@ -306,7 +305,7 @@ public class SendToFusionTables implements Runnable {
     Cursor locationsCursor = providerUtils.getLocationsCursor(track.getId(), 0, -1, false);
     try {
       if (!locationsCursor.moveToFirst()) {
-        Log.w(MyTracksConstants.TAG, "Unable to get any points to upload");
+        Log.w(Constants.TAG, "Unable to get any points to upload");
         return false;
       }
 
@@ -319,14 +318,14 @@ public class SendToFusionTables implements Runnable {
       // Limit the number of elevation readings. Ideally we would want around 250.
       int elevationSamplingFrequency =
           Math.max(1, (int) (totalLocations / 250.0));
-      Log.d(MyTracksConstants.TAG,
+      Log.d(Constants.TAG,
           "Using elevation sampling factor: " + elevationSamplingFrequency
           + " on " + totalLocations);
       double totalDistance = 0;
 
       Vector<Double> distances = new Vector<Double>();
       Vector<Double> elevations = new Vector<Double>();
-      DoubleBuffer elevationBuffer = new DoubleBuffer(MyTracksConstants.ELEVATION_SMOOTHING_FACTOR);
+      DoubleBuffer elevationBuffer = new DoubleBuffer(Constants.ELEVATION_SMOOTHING_FACTOR);
 
       List<Location> locations = new ArrayList<Location>(MAX_POINTS_PER_UPLOAD);
       Location lastLocation = null;
@@ -345,7 +344,7 @@ public class SendToFusionTables implements Runnable {
         }
 
         // Add to the elevation profile.
-        if (loc != null && MyTracksUtils.isValidLocation(loc)) {
+        if (loc != null && LocationUtils.isValidLocation(loc)) {
           // All points go into the smoothing buffer...
           elevationBuffer.setNext(metricUnits ? loc.getAltitude()
               : loc.getAltitude() * UnitConversions.M_TO_FT);
@@ -448,7 +447,7 @@ public class SendToFusionTables implements Runnable {
 
     int numLocations = locations.size();
     if (numLocations < 2) {
-      Log.d(MyTracksConstants.TAG, "Not preparing/uploading too few points");
+      Log.d(Constants.TAG, "Not preparing/uploading too few points");
       totalLocationsUploaded += numLocations;
       return true;
     }
@@ -464,16 +463,16 @@ public class SendToFusionTables implements Runnable {
                 context.getString(R.string.part), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
-      Log.d(MyTracksConstants.TAG,
+      Log.d(Constants.TAG,
           "SendToFusionTables: Prepared feature for upload w/ "
           + splitTrack.getLocations().size() + " points.");
 
       // Transmit tracks via GData feed:
       // -------------------------------
-      Log.d(MyTracksConstants.TAG,
+      Log.d(Constants.TAG,
             "SendToFusionTables: Uploading to table " + tableId + " w/ auth " + auth);
       if (!uploadTrackPoints(splitTrack)) {
-        Log.e(MyTracksConstants.TAG, "Uploading failed");
+        Log.e(Constants.TAG, "Uploading failed");
         return false;
       }
     }
@@ -519,7 +518,7 @@ public class SendToFusionTables implements Runnable {
         // Close up the last segment.
         prepareTrackSegment(segment, splitTracks);
 
-        Log.d(MyTracksConstants.TAG,
+        Log.d(Constants.TAG,
             "MyTracksSendToFusionTables: Starting new track segment...");
         startNewTrackSegment = false;
         segment = new Track();
@@ -567,12 +566,12 @@ public class SendToFusionTables implements Runnable {
      * Decimate to 2 meter precision. Fusion tables doesn't like too many
      * points:
      */
-    MyTracksUtils.decimate(segment, 2.0);
+    LocationUtils.decimate(segment, 2.0);
 
     /* If the track still has > 2500 points, split it in pieces: */
     final int maxPoints = 2500;
     if (segment.getLocations().size() > maxPoints) {
-      splitTracks.addAll(MyTracksUtils.split(segment, maxPoints));
+      splitTracks.addAll(LocationUtils.split(segment, maxPoints));
     } else if (segment.getLocations().size() >= 2) {
       splitTracks.add(segment);
     }
@@ -582,7 +581,7 @@ public class SendToFusionTables implements Runnable {
     int numLocations = splitTrack.getLocations().size();
     if (numLocations < 2) {
       // Need at least two points for a polyline:
-      Log.w(MyTracksConstants.TAG, "Not uploading too few points");
+      Log.w(Constants.TAG, "Not uploading too few points");
       return true;
     }
     return createNewLineString(splitTrack);
@@ -605,14 +604,14 @@ public class SendToFusionTables implements Runnable {
     try {
       c = providerUtils.getWaypointsCursor(
           track.getId(), 0,
-          MyTracksConstants.MAX_LOADED_WAYPOINTS_POINTS);
+          Constants.MAX_LOADED_WAYPOINTS_POINTS);
       if (c != null) {
         if (c.moveToFirst()) {
           // This will skip the 1st waypoint (it carries the stats for the
           // last segment).
           while (c.moveToNext()) {
             Waypoint wpt = providerUtils.createWaypoint(c);
-            Log.d(MyTracksConstants.TAG, "SendToFusionTables: Creating waypoint.");
+            Log.d(Constants.TAG, "SendToFusionTables: Creating waypoint.");
             success = createNewPoint(wpt.getName(), wpt.getDescription(), wpt.getLocation(),
             		MARKER_TYPE_WAYPOINT);
             if (!success) {
@@ -622,7 +621,7 @@ public class SendToFusionTables implements Runnable {
         }
       }
       if (!success) {
-        Log.w(MyTracksConstants.TAG, "SendToFusionTables: upload waypoints failed.");
+        Log.w(Constants.TAG, "SendToFusionTables: upload waypoints failed.");
       }
       return success;
     } finally {
@@ -657,7 +656,7 @@ public class SendToFusionTables implements Runnable {
     wrapper.setAuthManager(auth);
     wrapper.setRetryOnAuthFailure(true);
     wrapper.setClient(transport);
-    Log.d(MyTracksConstants.TAG, "GData connection prepared: " + this.auth);
+    Log.d(Constants.TAG, "GData connection prepared: " + this.auth);
     wrapper.runQuery(new QueryFunction<HttpTransport>() {
       @Override
       public void query(HttpTransport client)
@@ -672,7 +671,7 @@ public class SendToFusionTables implements Runnable {
         isc.inputStream = new ByteArrayInputStream(Strings.toBytesUtf8(sql));
         request.content = isc;
 
-        Log.d(MyTracksConstants.TAG, "Running update query " + url.toString() + ": " + sql);
+        Log.d(Constants.TAG, "Running update query " + url.toString() + ": " + sql);
         HttpResponse response;
         try {
           response = request.execute();
@@ -687,12 +686,12 @@ public class SendToFusionTables implements Runnable {
           String[] lines = s.split(Strings.LINE_SEPARATOR);
           if (lines[0].equals("tableid")) {
             tableId = lines[1];
-            Log.d(MyTracksConstants.TAG, "tableId = " + tableId);
+            Log.d(Constants.TAG, "tableId = " + tableId);
           } else {
-            Log.w(MyTracksConstants.TAG, "Unrecognized response: " + lines[0]);
+            Log.w(Constants.TAG, "Unrecognized response: " + lines[0]);
           }
         } else {
-          Log.d(MyTracksConstants.TAG, "Query failed: " + response.statusMessage + " (" +
+          Log.d(Constants.TAG, "Query failed: " + response.statusMessage + " (" +
               response.statusCode + ")");
           throw new GDataWrapper.HttpException(response.statusCode, response.statusMessage);
         }

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

@@ -15,17 +15,16 @@
  */
 package com.google.android.apps.mytracks.io;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
-import com.google.android.apps.mytracks.MyTracksSettings;
+import static com.google.android.apps.mytracks.Constants.TAG;
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.ProgressIndicator;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.io.mymaps.MapsFacade;
-import com.google.android.apps.mytracks.io.mymaps.MapsFacade.WaypointData;
 import com.google.android.apps.mytracks.stats.DoubleBuffer;
 import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.apps.mytracks.util.UnitConversions;
 import com.google.android.maps.mytracks.R;
@@ -93,7 +92,7 @@ public class SendToMyMaps implements Runnable {
 
   @Override
   public void run() {
-    Log.d(MyTracksConstants.TAG, "Sending to MyMaps: trackId = " + trackId);
+    Log.d(TAG, "Sending to MyMaps: trackId = " + trackId);
     doUpload();
   }
 
@@ -111,13 +110,13 @@ public class SendToMyMaps implements Runnable {
       track.setDescription("<p>" + track.getDescription() + "</p><p>"
           + stringUtils.generateTrackDescription(track, null, null) + "</p>");
 
-      mapsClient = MyMapsFactory.newMapsClient(context, auth);
+      mapsClient = new MapsFacade(context, auth);
   
       // Create a new map if necessary:
       boolean isNewMap = mapId.equals(NEW_MAP_ID);
       if (isNewMap) {
         SharedPreferences preferences = context.getSharedPreferences(
-            MyTracksSettings.SETTINGS_NAME, 0);
+            Constants.SETTINGS_NAME, 0);
         boolean mapPublic = true;
         if (preferences != null) {
           mapPublic = preferences.getBoolean(
@@ -142,17 +141,16 @@ public class SendToMyMaps implements Runnable {
       if (success) {
         Cursor c = providerUtils.getWaypointsCursor(
             track.getId(), 0,
-            MyTracksConstants.MAX_LOADED_WAYPOINTS_POINTS);
+            Constants.MAX_LOADED_WAYPOINTS_POINTS);
         if (c != null) {
           try {
             if (c.getCount() > 1 && c.moveToFirst()) {
               // This will skip the 1st waypoint (it carries the stats for the
               // last segment).
-              ArrayList<WaypointData> waypoints = new ArrayList<WaypointData>(c.getCount() - 1);
+              ArrayList<Waypoint> waypoints = new ArrayList<Waypoint>(c.getCount() - 1);
               while (c.moveToNext()) {
                 Waypoint wpt = providerUtils.createWaypoint(c);
-                waypoints.add(new WaypointData(
-                    wpt.getName(), wpt.getDescription(), wpt.getIcon(), wpt.getLocation()));
+                waypoints.add(wpt);
               }
 
               success = mapsClient.uploadWaypoints(mapId, waypoints);
@@ -165,8 +163,7 @@ public class SendToMyMaps implements Runnable {
         }
 
         if (!success) {
-          Log.w(MyTracksConstants.TAG,
-              "SendToMyMaps: upload waypoints failed.");
+          Log.w(TAG, "SendToMyMaps: upload waypoints failed.");
         }
       }
   
@@ -175,7 +172,7 @@ public class SendToMyMaps implements Runnable {
             ? R.string.status_new_mymap_has_been_created
             : R.string.status_tracks_have_been_uploaded;
       }
-      Log.d(MyTracksConstants.TAG, "SendToMyMaps: Done: " + success);
+      Log.d(TAG, "SendToMyMaps: Done: " + success);
       progressIndicator.setProgressValue(100);
     } finally {
       if (mapsClient != null) {
@@ -198,7 +195,7 @@ public class SendToMyMaps implements Runnable {
   private boolean uploadAllTrackPoints(
       final Track track, String originalDescription) {
     SharedPreferences preferences = context.getSharedPreferences(
-        MyTracksSettings.SETTINGS_NAME, 0);
+        Constants.SETTINGS_NAME, 0);
     boolean metricUnits = true;
     if (preferences != null) {
       metricUnits =
@@ -210,7 +207,7 @@ public class SendToMyMaps implements Runnable {
         providerUtils.getLocationsCursor(track.getId(), 0, -1, false);
     try {
       if (!locationsCursor.moveToFirst()) {
-        Log.w(MyTracksConstants.TAG, "Unable to get any points to upload");
+        Log.w(TAG, "Unable to get any points to upload");
         return false;
       }
   
@@ -223,7 +220,7 @@ public class SendToMyMaps implements Runnable {
       // Limit the number of elevation readings. Ideally we would want around 250.
       int elevationSamplingFrequency =
           Math.max(1, (int) (totalLocations / 250.0));
-      Log.d(MyTracksConstants.TAG,
+      Log.d(TAG,
             "Using elevation sampling factor: " + elevationSamplingFrequency
             + " on " + totalLocations);
       double totalDistance = 0;
@@ -231,7 +228,7 @@ public class SendToMyMaps implements Runnable {
       Vector<Double> distances = new Vector<Double>();
       Vector<Double> elevations = new Vector<Double>();
       DoubleBuffer elevationBuffer =
-          new DoubleBuffer(MyTracksConstants.ELEVATION_SMOOTHING_FACTOR);
+          new DoubleBuffer(Constants.ELEVATION_SMOOTHING_FACTOR);
   
       List<Location> locations = new ArrayList<Location>(MAX_POINTS_PER_UPLOAD);
       progressIndicator.setProgressMessage(
@@ -251,7 +248,7 @@ public class SendToMyMaps implements Runnable {
         }
   
         // Add to the elevation profile.
-        if (loc != null && MyTracksUtils.isValidLocation(loc)) {
+        if (loc != null && LocationUtils.isValidLocation(loc)) {
           // All points go into the smoothing buffer...
           elevationBuffer.setNext(metricUnits ? loc.getAltitude()
               : loc.getAltitude() * UnitConversions.M_TO_FT);
@@ -312,7 +309,7 @@ public class SendToMyMaps implements Runnable {
   
     int numLocations = locations.size();
     if (numLocations < 2) {
-      Log.d(MyTracksConstants.TAG, "Not preparing/uploading too few points");
+      Log.d(TAG, "Not preparing/uploading too few points");
       totalLocationsUploaded += numLocations;
       return true;
     }
@@ -330,16 +327,16 @@ public class SendToMyMaps implements Runnable {
                 context.getString(R.string.part), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
-      Log.d(MyTracksConstants.TAG,
+      Log.d(TAG,
           "SendToMyMaps: Prepared feature for upload w/ "
           + splitTrack.getLocations().size() + " points.");
   
       // Transmit tracks via GData feed:
       // -------------------------------
-      Log.d(MyTracksConstants.TAG,
+      Log.d(TAG,
             "SendToMyMaps: Uploading to map " + mapId + " w/ auth " + auth);
       if (!mapsClient.uploadTrackPoints(mapId, splitTrack.getName(), splitTrack.getLocations())) {
-        Log.e(MyTracksConstants.TAG, "Uploading failed");
+        Log.e(TAG, "Uploading failed");
         return false;
       }
     }
@@ -385,7 +382,7 @@ public class SendToMyMaps implements Runnable {
         // Close up the last segment.
         prepareTrackSegment(segment, splitTracks);
   
-        Log.d(MyTracksConstants.TAG,
+        Log.d(TAG,
             "MyTracksSendToMyMaps: Starting new track segment...");
         startNewTrackSegment = false;
         segment = new Track();
@@ -433,11 +430,11 @@ public class SendToMyMaps implements Runnable {
      * Decimate to 2 meter precision. Mapshop doesn't like too many
      * points:
      */
-    MyTracksUtils.decimate(segment, 2.0);
+    LocationUtils.decimate(segment, 2.0);
   
     /* It the track still has > 500 points, split it in pieces: */
     if (segment.getLocations().size() > 500) {
-      splitTracks.addAll(MyTracksUtils.split(segment, 500));
+      splitTracks.addAll(LocationUtils.split(segment, 500));
     } else if (segment.getLocations().size() >= 2) {
       splitTracks.add(segment);
     }

MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java

@@ -16,7 +16,7 @@
 package com.google.android.apps.mytracks.io.backup;
 
 import com.google.android.apps.mytracks.MyTracks;
-import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.util.FileUtils;
 import com.google.android.maps.mytracks.R;
 
@@ -97,7 +97,7 @@ public class BackupActivityHelper {
           backup.writeToDefaultFile();
           showToast(R.string.io_write_finished);
         } catch (IOException e) {
-          Log.e(MyTracksConstants.TAG, "Failed to write backup", e);
+          Log.e(Constants.TAG, "Failed to write backup", e);
           showToast(R.string.io_write_failed);
         } finally {
           dismissDialog(progressDialog);
@@ -199,7 +199,7 @@ public class BackupActivityHelper {
           backup.restoreFromDate(date);
           showToast(R.string.io_read_finished);
         } catch (IOException e) {
-          Log.e(MyTracksConstants.TAG, "Failed to restore backup", e);
+          Log.e(Constants.TAG, "Failed to restore backup", e);
           showToast(R.string.io_read_failed);
         } finally {
           dismissDialog(progressDialog);

MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java

@@ -15,8 +15,7 @@
  */
 package com.google.android.apps.mytracks.io.backup;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
-import com.google.android.apps.mytracks.MyTracksSettings;
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.TrackPointsColumns;
 import com.google.android.apps.mytracks.content.TracksColumns;
 import com.google.android.apps.mytracks.content.WaypointsColumns;
@@ -88,7 +87,7 @@ class ExternalFileBackup {
   private File getBackupsDirectory(boolean create) {
     String dirName = fileUtils.buildExternalDirectoryPath(BACKUPS_SUBDIR);
     final File dir = new File(dirName);
-    Log.d(MyTracksConstants.TAG, "Dir: " + dir.getAbsolutePath());
+    Log.d(Constants.TAG, "Dir: " + dir.getAbsolutePath());
     if (create) {
       // Try to create - if that fails, return null
       return fileUtils.ensureDirectoryExists(dir) ? dir : null;
@@ -147,7 +146,7 @@ class ExternalFileBackup {
    * Synchronously writes a backup to the given file.
    */
   private void writeToFile(File outputFile) throws IOException {
-    Log.d(MyTracksConstants.TAG,
+    Log.d(Constants.TAG,
         "Writing backup to file " + outputFile.getAbsolutePath());
 
     // Create all the auxiliary classes that will do the writing
@@ -201,7 +200,7 @@ class ExternalFileBackup {
 
       // Dump preferences
       SharedPreferences preferences =
-          context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+          context.getSharedPreferences(Constants.SETTINGS_NAME, 0);
       preferencesHelper.exportPreferences(preferences, outWriter);
     } catch (IOException e) {
       // We tried to delete the partially created file, but do nothing
@@ -219,7 +218,7 @@ class ExternalFileBackup {
    * Synchronously restores the backup from the given file.
    */
   private void restoreFromFile(File inputFile) throws IOException {
-    Log.d(MyTracksConstants.TAG,
+    Log.d(Constants.TAG,
         "Restoring from file " + inputFile.getAbsolutePath());
 
     PreferenceBackupHelper preferencesHelper = new PreferenceBackupHelper();
@@ -253,7 +252,7 @@ class ExternalFileBackup {
 
       // Restore preferences
       SharedPreferences preferences =
-          context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+          context.getSharedPreferences(Constants.SETTINGS_NAME, 0);
       preferencesHelper.importPreferences(reader, preferences);
     } finally {
       compressedStream.close();

MyTracks/src/com/google/android/apps/mytracks/io/backup/MyTracksBackupAgent.java

@@ -15,8 +15,7 @@
  */
 package com.google.android.apps.mytracks.io.backup;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
-import com.google.android.apps.mytracks.MyTracksSettings;
+import com.google.android.apps.mytracks.Constants;
 
 import android.app.backup.BackupAgent;
 import android.app.backup.BackupDataInput;
@@ -40,12 +39,12 @@ public class MyTracksBackupAgent extends BackupAgent {
   @Override
   public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data,
       ParcelFileDescriptor newState) throws IOException {
-    Log.i(MyTracksConstants.TAG, "Performing backup");
+    Log.i(Constants.TAG, "Performing backup");
     SharedPreferences preferences = this.getSharedPreferences(
-        MyTracksSettings.SETTINGS_NAME, 0);
+        Constants.SETTINGS_NAME, 0);
 
     backupPreferences(data, preferences);
-    Log.i(MyTracksConstants.TAG, "Backup complete");
+    Log.i(Constants.TAG, "Backup complete");
   }
 
   private void backupPreferences(BackupDataOutput data,
@@ -63,18 +62,18 @@ public class MyTracksBackupAgent extends BackupAgent {
   @Override
   public void onRestore(BackupDataInput data, int appVersionCode,
       ParcelFileDescriptor newState) throws IOException {
-    Log.i(MyTracksConstants.TAG, "Restoring from backup");
+    Log.i(Constants.TAG, "Restoring from backup");
     while (data.readNextHeader()) {
       String key = data.getKey();
-      Log.d(MyTracksConstants.TAG, "Restoring entity " + key);
+      Log.d(Constants.TAG, "Restoring entity " + key);
       if (key.equals(PREFERENCES_ENTITY)) {
         restorePreferences(data);
       } else {
-        Log.e(MyTracksConstants.TAG, "Found unknown backup entity: " + key);
+        Log.e(Constants.TAG, "Found unknown backup entity: " + key);
         data.skipEntityData();
       }
     }
-    Log.i(MyTracksConstants.TAG, "Done restoring from backup");
+    Log.i(Constants.TAG, "Done restoring from backup");
   }
 
   /**
@@ -92,7 +91,7 @@ public class MyTracksBackupAgent extends BackupAgent {
     }
 
     SharedPreferences preferences = this.getSharedPreferences(
-        MyTracksSettings.SETTINGS_NAME, 0);
+        Constants.SETTINGS_NAME, 0);
     PreferenceBackupHelper importer = createPreferenceBackupHelper();
     importer.importPreferences(dataBuffer, preferences);
   }

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

@@ -15,7 +15,7 @@
  */
 package com.google.android.apps.mytracks.io.docs;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.io.AuthManager;
 import com.google.android.apps.mytracks.io.gdata.GDataWrapper;
@@ -144,7 +144,7 @@ public class DocsHelper {
         
         String id = result.substring(
             idStringStart + DOCS_SPREADSHEET_URL.length(), idTagCloseIndex);
-        Log.i(MyTracksConstants.TAG, "Created new spreadsheet: " + id);
+        Log.i(Constants.TAG, "Created new spreadsheet: " + id);
         idSaver.set(id);
       }});
     
@@ -184,7 +184,7 @@ public class DocsHelper {
           while (listParser.hasMoreData()) {
             Entry entry = listParser.readNextEntry(null);
             String entryTitle = entry.getTitle();
-            Log.i(MyTracksConstants.TAG, "Found docs entry: " + entryTitle);
+            Log.i(Constants.TAG, "Found docs entry: " + entryTitle);
             if (entryTitle.equals(title)) {
               String entryId = entry.getId();
               int lastSlash = entryId.lastIndexOf('/');
@@ -233,7 +233,7 @@ public class DocsHelper {
               trixWrapper.getAuthManager().getAuthToken());
           sheetParser.init();
           if (!sheetParser.hasMoreData()) {
-            Log.i(MyTracksConstants.TAG, "Found no worksheets");
+            Log.i(Constants.TAG, "Found no worksheets");
             return;
           }
 
@@ -308,7 +308,7 @@ public class DocsHelper {
 
     if (track.getMapId().length() > 0) {
       tagBuilder.append("map", String.format("%s?msa=0&msid=%s",
-          MyTracksConstants.MAPSHOP_BASE_URL, track.getMapId()));
+          Constants.MAPSHOP_BASE_URL, track.getMapId()));
     }
     
     String postText = new StringBuilder()
@@ -319,14 +319,14 @@ public class DocsHelper {
         .append("</entry>")
         .toString();
 
-    Log.i(MyTracksConstants.TAG,
+    Log.i(Constants.TAG,
         "Inserting at: " + spreadsheetId + " => " + worksheetUri);
 
-    Log.i(MyTracksConstants.TAG, postText);
+    Log.i(Constants.TAG, postText);
     
     writeRowData(trixAuth, worksheetUri, postText);
 
-    Log.i(MyTracksConstants.TAG, "Post finished.");
+    Log.i(Constants.TAG, "Post finished.");
   }
 
   /**
@@ -358,13 +358,13 @@ public class DocsHelper {
     String line;
     while ((line = rd.readLine()) != null) {
       // Process line.
-      Log.i(MyTracksConstants.TAG, "r: " + line);
+      Log.i(Constants.TAG, "r: " + line);
     }
     wr.close();
     rd.close();
   }
-  
-  private static IOException newIOException(GDataWrapper wrapper, 
+
+  private static IOException newIOException(GDataWrapper<GDataServiceClient> wrapper, 
       String message) {
     return new IOException(String.format("%s: %d: %s", message, 
         wrapper.getErrorType(), wrapper.getErrorMessage()));

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

@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io;
+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.TrackWriterFactory.TrackFileFormat;
+import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
 
 import android.location.Location;
 

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

@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io;
+package com.google.android.apps.mytracks.io.file;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.stats.TripStatisticsBuilder;
-import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.apps.mytracks.util.StringUtils;
 
 import android.location.Location;
@@ -174,7 +174,7 @@ public class GpxImporter extends DefaultHandler {
       parser.parse(is, handler);
 
       long end = System.currentTimeMillis();
-      Log.d(MyTracksConstants.TAG, "Total import time: " + (end - start) + "ms");
+      Log.d(Constants.TAG, "Total import time: " + (end - start) + "ms");
 
       trackIds = handler.getImportedTrackIds();
     } finally {
@@ -362,7 +362,7 @@ public class GpxImporter extends DefaultHandler {
    * @throws SAXException - thrown if track point is invalid
    */
   private void onTrackPointElementEnd() throws SAXException {
-    if (MyTracksUtils.isValidLocation(location)) {
+    if (LocationUtils.isValidLocation(location)) {
       if (statsBuilder == null) {
         // first point did not have a time, start stats builder without it
         statsBuilder = new TripStatisticsBuilder(0);
@@ -462,7 +462,7 @@ public class GpxImporter extends DefaultHandler {
 
       // check for negative time change
       if (timeDifference < 0) {
-        Log.w(MyTracksConstants.TAG, "Found negative time change.");
+        Log.w(Constants.TAG, "Found negative time change.");
       } else {
 
         // We don't have a speed and bearing in GPX, make something up from

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

@@ -13,14 +13,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io;
+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.TrackWriterFactory.TrackFileFormat;
+import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
 import com.google.android.apps.mytracks.util.StringUtils;
 
 import android.location.Location;
+import android.os.Build;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
@@ -85,7 +86,7 @@ public class GpxTrackWriter implements TrackFormatWriter {
       pw.println("<?xml-stylesheet type=\"text/xsl\" href=\"details.xsl\"?>");
       pw.println("<gpx");
       pw.println(" version=\"1.1\"");
-      pw.println(" creator=\"My Tracks for the G1 running Android\"");
+      pw.format(" creator=\"My Tracks running on %s\"\n", Build.MODEL);
       pw.println(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
       pw.println(" xmlns=\"http://www.topografix.com/GPX/1/1\"");
       pw.print(" xmlns:topografix=\"http://www.topografix.com/GPX/Private/"

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

@@ -13,15 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io;
+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.TrackWriterFactory.TrackFileFormat;
+import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
 import com.google.android.apps.mytracks.util.StringUtils;
 
 import android.content.Context;
 import android.location.Location;
+import android.os.Build;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
@@ -70,8 +71,9 @@ public class KmlTrackWriter implements TrackFormatWriter {
       pw.print(" xmlns=\"http://earth.google.com/kml/2.0\"");
       pw.println(" xmlns:atom=\"http://www.w3.org/2005/Atom\">");
       pw.println("<Document>");
-      pw.println("<atom:author><atom:name>My Tracks running on Android"
-          + "</atom:name></atom:author>");
+      pw.format("<atom:author><atom:name>My Tracks running on %s"
+          + "</atom:name></atom:author>\n", Build.MODEL);
+
       pw.println("<name>" + StringUtils.stringAsCData(track.getName())
           + "</name>");
       pw.println("<description>"

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

@@ -1,27 +1,29 @@
 /*
  * 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;
+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.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.content.Sensor.SensorDataSet;
-import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat;
+import com.google.android.apps.mytracks.io.file.TrackWriterFactory.TrackFileFormat;
+import com.google.android.apps.mytracks.util.SystemUtils;
 
+import android.content.Context;
 import android.location.Location;
 import android.os.Build;
 
@@ -30,6 +32,7 @@ import java.io.PrintWriter;
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 import java.util.TimeZone;
 
 /**
@@ -37,20 +40,35 @@ import java.util.TimeZone;
  * As defined by:
  * http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2
  *
+ * The TCX file written by this class has been verified as compatible with
+ * Garmin Training Center 3.5.3.
+ *
  * @author Sandor Dornbush
  */
 public class TcxTrackWriter implements TrackFormatWriter {
+  protected static final String TIMESTAMP_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+
+  // 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 SimpleDateFormat timestampFormatter;
+  private final Context context;
 
   private PrintWriter pw = null;
   private Track track;
 
-  static final SimpleDateFormat TIMESTAMP_FORMAT =
-      new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-  static {
-    TIMESTAMP_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
-  }
+  public TcxTrackWriter(Context context) {
+    this.context = context;
 
-  public TcxTrackWriter() {
+    timestampFormatter = new SimpleDateFormat(TIMESTAMP_FORMAT);
+    timestampFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
   }
 
   @Override
@@ -93,16 +111,13 @@ public class TcxTrackWriter implements TrackFormatWriter {
     if (pw == null) {
       return;
     }
+
+    String startTime = timestampFormatter.format(track.getStatistics().getStartTime());
+
     pw.println("  <Activities>");
-    pw.print("    <Activity Sport=\"");
-    if (track.getCategory() != null) {
-      pw.print(track.getCategory());
-    }
-    pw.println("\">");
-    pw.print("      <Id>");
-    pw.print(TIMESTAMP_FORMAT.format(track.getStatistics().getStartTime()));
-    pw.println("</Id>");
-    pw.println("      <Lap>");
+    pw.format("    <Activity Sport=\"%s\">\n", categoryToTcxSport(track.getCategory()));
+    pw.format("      <Id>%s</Id>\n", startTime);
+    pw.format("      <Lap StartTime=\"%s\">\n", startTime);
     pw.print("        <TotalTimeSeconds>");
     pw.print(track.getStatistics().getTotalTime() / 1000);
     pw.println("</TotalTimeSeconds>");
@@ -113,7 +128,7 @@ public class TcxTrackWriter implements TrackFormatWriter {
     // Calories are a required element just put in 0.
     pw.print("<Calories>0</Calories>");
     pw.println("<Intensity>Active</Intensity>");
-    pw.println("<TriggerMethod>Manual</TriggerMethod>)");
+    pw.println("<TriggerMethod>Manual</TriggerMethod>");
   }
 
   @Override
@@ -130,7 +145,7 @@ public class TcxTrackWriter implements TrackFormatWriter {
     }
     pw.println("        <Trackpoint>");
     Date d = new Date(location.getTime());
-    pw.println("          <Time>" + TIMESTAMP_FORMAT.format(d) + "</Time>");
+    pw.println("          <Time>" + timestampFormatter.format(d) + "</Time>");
     pw.println("          <Position>");
 
     pw.print("            <LatitudeDegrees>");
@@ -194,10 +209,18 @@ public class TcxTrackWriter implements TrackFormatWriter {
     }
     pw.println("      </Lap>");
     pw.print("      <Creator xsi:type=\"Device_t\">");
-    pw.print("<Name>");
-    pw.print(Build.MODEL);
-    pw.print("</Name>");
-    pw.println("</Creator>)");
+    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>");
+
+    pw.println("<Version>");
+    pw.println("<VersionMajor>0</VersionMajor>");
+    pw.println("<VersionMinor>0</VersionMinor>");
+    pw.println("</Version>");
+    pw.println("</Creator>");
     pw.println("    </Activity>");
     pw.println("  </Activities>");
   }
@@ -207,8 +230,31 @@ public class TcxTrackWriter implements TrackFormatWriter {
     if (pw == null) {
       return;
     }
-    pw.print("  <Author xsi:type=\"Application_t\">");
-    pw.print("<Name>My Tracks by Google</Name>");
+    pw.println("  <Author xsi:type=\"Application_t\">");
+
+    // We put the version in the name because there isn't a better place for
+    // it.  The TCX schema tightly defined the Version tag, so we can't put it
+    // there.  They've similarly constrained the PartNumber tag, so it can't go
+    // there either.
+    pw.format("<Name>My Tracks %s by Google</Name>\n", SystemUtils.getMyTracksVersion(context));
+
+    pw.println("<Build>");
+
+    // The TCX spec for the Version tag is too strict to allow us to use our
+    // user-visible version number, so we use our version code instead.  We
+    // also set the minor version to 1 if this is a development build to
+    // signify that this build is newer than the one associated with the
+    // version code given in VersionMajor.
+    pw.println("<Version>");
+    pw.format("<VersionMajor>%s</VersionMajor>\n", SystemUtils.getMyTracksVersion(context));
+    pw.format("<VersionMinor>%d</VersionMinor>\n", SystemUtils.isRelease(context) ? 0 : 1);
+    pw.println("</Version>");
+
+    pw.format("<Type>%s</Type>\n", SystemUtils.isRelease(context) ? TCX_TYPE_RELEASE
+        : TCX_TYPE_INTERNAL);
+    pw.println("</Build>");
+    pw.format("<LangID>%s</LangID>\n", Locale.getDefault().getLanguage());
+    pw.println("<PartNumber>000-00000-00</PartNumber>");
     pw.println("</Author>");
     pw.println("</TrainingCenterDatabase>");
   }
@@ -217,4 +263,15 @@ public class TcxTrackWriter implements TrackFormatWriter {
   public void writeWaypoint(Waypoint waypoint) {
     // TODO Write out the waypoints somewhere.
   }
+
+  private String categoryToTcxSport(String category) {
+    category = category.trim();
+    if (category.equalsIgnoreCase(TCX_SPORT_RUNNING)) {
+      return TCX_SPORT_RUNNING;
+    } else if (category.equalsIgnoreCase(TCX_SPORT_BIKING)) {
+      return TCX_SPORT_BIKING;
+    } else {
+      return TCX_SPORT_OTHER;
+    }
+  }
 }

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.android.apps.mytracks.io;
+package com.google.android.apps.mytracks.io.file;
 
 import android.os.Environment;
 

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

@@ -1,19 +1,19 @@
 /*
  * 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;
+package com.google.android.apps.mytracks.io.file;
 
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
@@ -54,7 +54,7 @@ public interface TrackFormatWriter {
   void prepare(Track track, OutputStream out);
 
   /**
-   * @return The file extentsion (i.e. gpx, kml, ...)
+   * @return The file extension (i.e. gpx, kml, ...)
    */
   String getExtension();
 
@@ -77,7 +77,7 @@ public interface TrackFormatWriter {
    *
    * @param location the location to write
    */
-  void writeLocation(Location location);
+  void writeLocation(Location location) throws InterruptedException;
 
   /**
    * Write a way point.

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

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2011 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 java.io.File;
+
+/**
+ * Implementations of this class export tracks to the SD card.  This class is
+ * intended to be format-neutral - it handles creating the output file and
+ * reading the track to be exported, but requires an instance of
+ * {@link TrackFormatWriter} to actually format the data.
+ *
+ * @author Sandor Dornbush
+ * @author Rodrigo Damazio
+ */
+public interface TrackWriter {
+  /** This listener is used to signal completion of track write */
+  public interface OnCompletionListener {
+    public void onComplete();
+  }
+
+  /** This listener is used to signal track writes. */
+  public interface OnWriteListener {
+    /**
+     * This method is invoked whenever a location within a track is written.
+     * @param number the location number
+     * @param max the maximum number of locations, for calculation of
+     *     completion percentage
+     */
+    public void onWrite(int number, int max);
+  }
+
+  /**
+   * Sets listener to be invoked when the writer has finished.
+   */
+  void setOnCompletionListener(OnCompletionListener onCompletionListener);
+
+  /**
+   * Sets a listener to be invoked for each location writer.
+   */
+  void setOnWriteListener(OnWriteListener onWriteListener);
+
+  /**
+   * Sets a custom directory where the file will be written.
+   */
+  void setDirectory(File directory);
+
+  /**
+   * Returns the absolute path to the file which was created.
+   */
+  String getAbsolutePath();
+
+  /**
+   * Writes the given track id to the SD card.
+   * This is non-blocking.
+   */
+  void writeTrackAsync();
+
+  /**
+   * Writes the given track id to the SD card.
+   * This is blocking.
+   */
+  void writeTrack();
+
+  /**
+   * Stop any in-progress writes
+   */
+  void stopWriteTrack();
+
+  /**
+   * Returns true if the write completed successfully.
+   */
+  boolean wasSuccess();
+
+  /**
+   * Returns the error message (if any) generated by a writer failure.
+   */
+  int getErrorMessage();
+}

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

@@ -1,12 +1,12 @@
 /*
  * 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
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.android.apps.mytracks.io;
+package com.google.android.apps.mytracks.io.file;
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
@@ -53,7 +53,7 @@ public class TrackWriterFactory {
     TCX {
       @Override
       public TrackFormatWriter newFormatWriter(Context context) {
-        return new TcxTrackWriter();
+        return new TcxTrackWriter(context);
       }
     };
 
@@ -106,7 +106,7 @@ public class TrackWriterFactory {
       MyTracksProviderUtils providerUtils,
       Track track, TrackFileFormat format) {
     TrackFormatWriter writer = format.newFormatWriter(context);
-    return new TrackWriter(context, providerUtils, track, writer);
+    return new TrackWriterImpl(context, providerUtils, track, writer);
   }
 
   private TrackWriterFactory() { }

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

@@ -1,28 +1,28 @@
 /*
  * Copyright 2008 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;
+package com.google.android.apps.mytracks.io.file;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.content.MyTracksLocation;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
+import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationIterator;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationIterator;
 import com.google.android.apps.mytracks.util.FileUtils;
-import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.apps.mytracks.util.LocationUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
@@ -37,28 +37,29 @@ import java.io.FileOutputStream;
 import java.io.OutputStream;
 
 /**
- * The class which exports tracks to the SD card.
- * This writer is format-neutral - it handles creating the output file
- * and reading the track to be exported, but requires an instance of
- * {@link TrackFormatWriter} to actually format the data.
+ * This class exports tracks to the SD card.  It is intended to be format-
+ * neutral -- it handles creating the output file and reading the track to be
+ * exported, but requires an instance of {@link TrackFormatWriter} to actually
+ * format the data.
  *
  * @author Sandor Dornbush
  * @author Rodrigo Damazio
  */
-public class TrackWriter {
-
+class TrackWriterImpl implements TrackWriter {
   private final Context context;
   private final MyTracksProviderUtils providerUtils;
   private final Track track;
   private final TrackFormatWriter writer;
   private final FileUtils fileUtils;
-  private Runnable onCompletion = null;
   private boolean success = false;
   private int errorMessage = -1;
   private File directory = null;
   private File file = null;
+  private OnCompletionListener onCompletionListener;
+  private OnWriteListener onWriteListener;
+  private Thread writeThread;
 
-  public TrackWriter(Context context, MyTracksProviderUtils providerUtils,
+  TrackWriterImpl(Context context, MyTracksProviderUtils providerUtils,
       Track track, TrackFormatWriter writer) {
     this.context = context;
     this.providerUtils = providerUtils;
@@ -67,60 +68,88 @@ public class TrackWriter {
     this.fileUtils = new FileUtils();
   }
 
-  /**
-   * Sets a completion callback.
-   *
-   * @param onCompletion Runnable that will be executed when finished
-   */
-  public void setOnCompletion(Runnable onCompletion) {
-    this.onCompletion = onCompletion;
+  @Override
+  public void setOnCompletionListener(OnCompletionListener onCompletionListener) {
+    this.onCompletionListener = onCompletionListener;
   }
 
-  /**
-   * Sets a custom directory where the file will be written.
-   */
+  @Override
+  public void setOnWriteListener(OnWriteListener onWriteListener) {
+    this.onWriteListener = onWriteListener;
+  }
+
+  @Override
   public void setDirectory(File directory) {
     this.directory = directory;
   }
 
+  @Override
   public String getAbsolutePath() {
     return file.getAbsolutePath();
   }
 
-  /**
-   * Writes the given track id to the SD card.
-   * This is non-blocking.
-   */
+  @Override
   public void writeTrackAsync() {
-    Thread t = new Thread() {
+    writeThread = new Thread() {
       @Override
       public void run() {
-        writeTrack();
+        doWriteTrack();
       }
     };
-    t.start();
+    writeThread.start();
   }
 
-  /**
-   * Writes the given track id to the SD card.
-   * This is blocking.
-   */
+  @Override
   public void writeTrack() {
+    writeTrackAsync();
+    try {
+      writeThread.join();
+    } catch (InterruptedException e) {
+      Log.e(Constants.TAG, "Interrupted waiting for write to complete", e);
+    }
+  }
+
+  private void doWriteTrack() {
     // Open the input and output
     success = false;
     errorMessage = R.string.error_track_does_not_exist;
     if (track != null) {
       if (openFile()) {
-        writeDocument();
+        try {
+          writeDocument();
+        } catch (InterruptedException e) {
+          Log.i(Constants.TAG, "The track write was interrupted");
+          if (file != null) {
+            file.delete();
+          }
+          success = false;
+          errorMessage = R.string.error_operation_cancelled;
+        }
       }
     }
     finished();
   }
 
+  public void stopWriteTrack() {
+    if (writeThread != null && writeThread.isAlive()) {
+      Log.i(Constants.TAG, "Attempting to stop track write");
+      writeThread.interrupt();
+
+      try {
+        writeThread.join();
+        Log.i(Constants.TAG, "Track write stopped");
+      } catch (InterruptedException e) {
+        Log.e(Constants.TAG, "Failed to wait for writer to stop", e);
+      }
+    }
+  }
+
+  @Override
   public int getErrorMessage() {
     return errorMessage;
   }
 
+  @Override
   public boolean wasSuccess() {
     return success;
   }
@@ -131,8 +160,13 @@ public class TrackWriter {
    */
 
   private void finished() {
-    if (onCompletion != null) {
-      runOnUiThread(onCompletion);
+    if (onCompletionListener != null) {
+      runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          onCompletionListener.onComplete();
+        }
+      });
       return;
     }
   }
@@ -147,8 +181,8 @@ public class TrackWriter {
   }
 
   /**
-   * Opens the file and prepares the format writer for it. 
-   * 
+   * Opens the file and prepares the format writer for it.
+   *
    * @return true on success, false otherwise (and errorMessage is set)
    */
   protected boolean openFile() {
@@ -160,16 +194,16 @@ public class TrackWriter {
     String fileName = fileUtils.buildUniqueFileName(
         directory, track.getName(), writer.getExtension());
     if (fileName == null) {
-      Log.e(MyTracksConstants.TAG,
+      Log.e(Constants.TAG,
           "Unable to get a unique filename for " + fileName);
       return false;
     }
 
-    Log.i(MyTracksConstants.TAG, "Writing track to: " + fileName);
+    Log.i(Constants.TAG, "Writing track to: " + fileName);
     try {
       writer.prepare(track, newOutputStream(fileName));
     } catch (FileNotFoundException e) {
-      Log.e(MyTracksConstants.TAG, "Failed to open output file.", e);
+      Log.e(Constants.TAG, "Failed to open output file.", e);
       errorMessage = R.string.io_write_failed;
       return false;
     }
@@ -187,12 +221,12 @@ public class TrackWriter {
     }
 
     if (!fileUtils.isSdCardAvailable()) {
-      Log.i(MyTracksConstants.TAG, "Could not find SD card.");
+      Log.i(Constants.TAG, "Could not find SD card.");
       errorMessage = R.string.io_no_external_storage_found;
       return false;
     }
     if (!fileUtils.ensureDirectoryExists(directory)) {
-      Log.i(MyTracksConstants.TAG, "Could not create export directory.");
+      Log.i(Constants.TAG, "Could not create export directory.");
       errorMessage = R.string.io_create_dir_failed;
       return false;
     }
@@ -230,7 +264,7 @@ public class TrackWriter {
     // same time.
     Cursor cursor = null;
     cursor = providerUtils.getWaypointsCursor(trackId, 0,
-        MyTracksConstants.MAX_LOADED_WAYPOINTS_POINTS);
+        Constants.MAX_LOADED_WAYPOINTS_POINTS);
     if (cursor != null) {
       try {
         if (cursor.moveToFirst()) {
@@ -252,27 +286,27 @@ public class TrackWriter {
   /**
    * Does the actual work of writing the track to the now open file.
    */
-  void writeDocument() {
-    Log.d(MyTracksConstants.TAG, "Started writing track.");
+  void writeDocument() throws InterruptedException {
+    Log.d(Constants.TAG, "Started writing track.");
     writer.writeHeader();
     writeWaypoints(track.getId());
     writeLocations();
     writer.writeFooter();
     writer.close();
     success = true;
-    Log.d(MyTracksConstants.TAG, "Done writing track.");
+    Log.d(Constants.TAG, "Done writing track.");
     errorMessage = R.string.io_write_finished;
   }
 
-  private void writeLocations() {
+  private void writeLocations() throws InterruptedException {
     boolean wroteFirst = false;
     boolean segmentOpen = false;
     boolean isLastValid = false;
-    
+
     class TrackWriterLocationFactory implements MyTracksProviderUtils.LocationFactory {
       Location currentLocation;
       Location lastLocation;
-        
+
       @Override
       public Location createLocation() {
         if (currentLocation == null) {
@@ -280,7 +314,7 @@ public class TrackWriter {
         }
         return currentLocation;
       }
-      
+
       public void swapLocations() {
         Location tmpLoc = lastLocation;
         lastLocation = currentLocation;
@@ -290,45 +324,54 @@ public class TrackWriter {
         }
       }
     };
-    
+
     TrackWriterLocationFactory locationFactory = new TrackWriterLocationFactory();
     LocationIterator it = providerUtils.getLocationIterator(track.getId(), 0, false,
         locationFactory);
     try {
       if (!it.hasNext()) {
-        Log.w(MyTracksConstants.TAG, "Unable to get any points to write");
+        Log.w(Constants.TAG, "Unable to get any points to write");
         return;
       }
+      int pointNumber = 0;
       while (it.hasNext()) {
         Location loc = it.next();
-  
-        boolean isValid = MyTracksUtils.isValidLocation(loc);
+        if (Thread.interrupted()) {
+          throw new InterruptedException();
+        }
+
+        pointNumber++;
+
+        boolean isValid = LocationUtils.isValidLocation(loc);
         boolean validSegment = isValid && isLastValid;
         if (!wroteFirst && validSegment) {
           // Found the first two consecutive points which are valid
           writer.writeBeginTrack(locationFactory.lastLocation);
           wroteFirst = true;
         }
-  
+
         if (validSegment) {
           if (!segmentOpen) {
             // Start a segment for this point
             writer.writeOpenSegment();
             segmentOpen = true;
-  
+
             // Write the previous point, which we had previously skipped
             writer.writeLocation(locationFactory.lastLocation);
           }
-  
+
           // Write the current point
           writer.writeLocation(loc);
+          if (onWriteListener != null) {
+            onWriteListener.onWrite(pointNumber, track.getNumberOfPoints());
+          }
         } else {
           if (segmentOpen) {
             writer.writeCloseSegment();
             segmentOpen = false;
           }
         }
-  
+
         locationFactory.swapLocations();
         isLastValid = isValid;
       }

MyTracks/src/com/google/android/apps/mytracks/io/gdata/GDataClientFactory.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.apps.mytracks.io.gdata;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.Constants;
 import com.google.wireless.gdata.client.GDataClient;
 
 import android.content.Context;
@@ -43,7 +43,7 @@ public class GDataClientFactory {
     } catch (LinkageError e) {
       // On all other platforms use the client implementation packaged in the
       // apk.
-      Log.i(MyTracksConstants.TAG, "Using mytracks AndroidGDataClient.", e);
+      Log.i(Constants.TAG, "Using mytracks AndroidGDataClient.", e);
       return new com.google.android.apps.mytracks.io.gdata.AndroidGDataClient();
     }
   }

MyTracks/src/com/google/android/apps/mytracks/io/gdata/GDataWrapper.java

@@ -15,7 +15,7 @@
  */
 package com.google.android.apps.mytracks.io.gdata;
 
-import com.google.android.apps.mytracks.MyTracksConstants;
+import com.google.android.apps.mytracks.Constants;
 import com.google.android.apps.mytracks.io.AuthManager;
 
 import android.util.Log;
@@ -173,14 +173,14 @@ public class GDataWrapper<C> {
         return true;
       }
 
-      Log.d(MyTracksConstants.TAG, "GData error encountered: " + errorMessage);
+      Log.d(Constants.TAG, "GData error encountered: " + errorMessage);
       if (errorType == ERROR_AUTH && auth != null) {
         if (!retryOnAuthFailure || !invalidateAndRefreshAuthToken()) {
           return false;
         }
       }
       
-      Log.d(MyTracksConstants.TAG, "retrying function/query");
+      Log.d(Constants.TAG, "retrying function/query");
     }
     return false;
   }
@@ -206,11 +206,11 @@ public class GDataWrapper<C> {
       errorMessage = null;
 
     } catch (AuthenticationException e) {
-      Log.e(MyTracksConstants.TAG, "AuthenticationException", e);
+      Log.e(Constants.TAG, "AuthenticationException", e);
       errorType = ERROR_AUTH;
       errorMessage = e.getMessage();
     } catch (HttpException e) {
-      Log.e(MyTracksConstants.TAG, 
+      Log.e(Constants.TAG, 
           "HttpException, code " + e.getStatusCode() + " message " + e.getMessage(), e);
       errorMessage = e.getMessage();
       if (e.getStatusCode() == 401) {
@@ -219,11 +219,11 @@ public class GDataWrapper<C> {
         errorType = ERROR_CONNECTION;
       }
     } catch (FileNotFoundException e) {
-      Log.e(MyTracksConstants.TAG, "Exception", e);
+      Log.e(Constants.TAG, "Exception", e);
       errorType = ERROR_AUTH;
       errorMessage = e.getMessage();
     } catch (IOException e) {
-      Log.e(MyTracksConstants.TAG, "Exception", e);
+      Log.e(Constants.TAG, "Exception", e);
       errorMessage = e.getMessage();
       if (errorMessage != null && errorMessage.contains("503")) {
         errorType = ERROR_INTERNAL;
@@ -231,11 +231,11 @@ public class GDataWrapper<C> {
         errorType = ERROR_CONNECTION;
       }
     } catch (ParseException e) {
-      Log.e(MyTracksConstants.TAG, "Exception", e);
+      Log.e(Constants.TAG, "Exception", e);
       errorType = ERROR_LOCAL;
       errorMessage = e.getMessage();
     } catch (ConflictDetectedException e) {
-      Log.e(MyTracksConstants.TAG, "Exception", e);
+      Log.e(Constants.TAG, "Exception", e);
       errorType = ERROR_CONFLICT;
       errorMessage = e.getMessage();
     }
@@ -249,7 +249,7 @@ public class GDataWrapper<C> {
    *   times out.
    */
   private boolean invalidateAndRefreshAuthToken() {
-    Log.d(MyTracksConstants.TAG, "Retrying due to auth failure");
+    Log.d(Constants.TAG, "Retrying due to auth failure");
     // This FutureTask doesn't do anything -- it exists simply to be
     // blocked upon using get().
     FutureTask<?> whenFinishedFuture = new FutureTask<Object>(new Runnable() {
@@ -259,18 +259,18 @@ public class GDataWrapper<C> {
     auth.invalidateAndRefresh(whenFinishedFuture);
 
     try {
-      Log.d(MyTracksConstants.TAG, "waiting for invalidate");
+      Log.d(Constants.TAG, "waiting for invalidate");
       whenFinishedFuture.get(AUTH_TOKEN_INVALIDATE_REFRESH_TIMEOUT, 
           TimeUnit.MILLISECONDS);
-      Log.d(MyTracksConstants.TAG, "invalidate finished");
+      Log.d(Constants.TAG, "invalidate finished");
       return true;
 
     } catch (InterruptedException e) {
-      Log.e(MyTracksConstants.TAG, "Failed to invalidate", e);
+      Log.e(Constants.TAG, "Failed to invalidate", e);
     } catch (ExecutionException e) {
-      Log.e(MyTracksConstants.TAG, "Failed to invalidate", e);
+      Log.e(Constants.TAG, "Failed to invalidate", e);
     } catch (TimeoutException e) {
-      Log.e(MyTracksConstants.TAG, "Invalidate didn't complete in time", e);
+      Log.e(Constants.TAG, "Invalidate didn't complete in time", e);
     } finally {
       whenFinishedFuture.cancel(false);
     }

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/GeoRect.java

@@ -0,0 +1,50 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+import com.google.android.maps.GeoPoint;
+
+/**
+ * A rectangle in geographical space.
+ */
+class GeoRect {
+  public int top;
+  public int left;
+  public int bottom;
+  public int right;
+
+  public GeoRect() {
+    top = 0;
+    left = 0;
+    bottom = 0;
+    right = 0;
+  }
+
+  public GeoRect(GeoPoint center, int latSpan, int longSpan) {
+    top = center.getLatitudeE6() - latSpan / 2;
+    left = center.getLongitudeE6() - longSpan / 2;
+    bottom = center.getLatitudeE6() + latSpan / 2;
+    right = center.getLongitudeE6() + longSpan / 2;
+  }
+
+  public GeoPoint getCenter() {
+    return new GeoPoint(top / 2 + bottom / 2, left / 2 + right / 2);
+  }
+
+  public int getLatSpan() {
+    return bottom - top;
+  }
+
+  public int getLongSpan() {
+    return right - left;
+  }
+
+  public boolean contains(GeoPoint geoPoint) {
+    if (geoPoint.getLatitudeE6() >= top
+        && geoPoint.getLatitudeE6() <= bottom
+        && geoPoint.getLongitudeE6() >= left
+        && geoPoint.getLongitudeE6() <= right) {
+      return true;
+    }
+    return false;
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapFeatureEntry.java

@@ -0,0 +1,36 @@
+// Copyright 2010 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+import com.google.wireless.gdata.data.Entry;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * GData entry for a map feature.
+ */
+class MapFeatureEntry extends Entry {
+
+  private String mPrivacy = null;
+  private Map<String, String> mAttributes = new HashMap<String, String>();
+
+  public void setPrivacy(String privacy) {
+    mPrivacy = privacy;
+  }
+
+  public String getPrivacy() {
+    return mPrivacy;
+  }
+
+  public void setAttribute(String name, String value) {
+    mAttributes.put(name, value);
+  }
+
+  public void removeAttribute(String name) {
+    mAttributes.remove(name);
+  }
+
+  public Map<String, String> getAllAttributes() {
+    return mAttributes;
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsClient.java

@@ -0,0 +1,101 @@
+// Copyright 2010 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+import com.google.wireless.gdata.client.GDataClient;
+import com.google.wireless.gdata.client.GDataParserFactory;
+import com.google.wireless.gdata.client.GDataServiceClient;
+
+import android.util.Log;
+
+/**
+ * Client to talk to Google Maps via GData.
+ */
+class MapsClient extends GDataServiceClient {
+  private static final boolean DEBUG = false;
+  public static final boolean LOG_COMMUNICATION = false;
+
+  private static final String MAPS_BASE_FEED_URL =
+      "http://maps.google.com/maps/feeds/";
+  private static final String MAPS_MAP_FEED_PATH = "maps/default/full";
+  private static final String MAPS_FEATURE_FEED_PATH_BEFORE_MAPID = "features/";
+  private static final String MAPS_FEATURE_FEED_PATH_AFTER_MAPID = "/full";
+  private static final String MAPS_VERSION_FEED_PATH_FORMAT =
+      "%smaps/%s/versions/%s/full/%s";
+
+  private static final String MAP_ENTRY_ID_BEFORE_USER_ID = "maps/feeds/maps/";
+  private static final String MAP_ENTRY_ID_BETWEEN_USER_ID_AND_MAP_ID = "/";
+  private static final String V2_ONLY_PARAM = "?v=2.0";
+
+  public MapsClient(GDataClient dataClient,
+      GDataParserFactory dataParserFactory) {
+    super(dataClient, dataParserFactory);
+  }
+
+  @Override
+  public String getServiceName() {
+    return MyMapsConstants.SERVICE_NAME;
+  }
+
+  public static String buildMapUrl(String mapId) {
+    return MyMapsConstants.MAPSHOP_BASE_URL + "?msa=0&msid=" + mapId;
+  }
+
+  public static String getMapsFeed() {
+    if (DEBUG) {
+      Log.d("Maps Client", "Requesting map feed:");
+    }
+    return MAPS_BASE_FEED_URL + MAPS_MAP_FEED_PATH + V2_ONLY_PARAM;
+  }
+
+  public static String getFeaturesFeed(String mapid) {
+    StringBuilder feed = new StringBuilder();
+    feed.append(MAPS_BASE_FEED_URL);
+    feed.append(MAPS_FEATURE_FEED_PATH_BEFORE_MAPID);
+    feed.append(mapid);
+    feed.append(MAPS_FEATURE_FEED_PATH_AFTER_MAPID);
+    feed.append(V2_ONLY_PARAM);
+    return feed.toString();
+  }
+
+  public static String getMapIdFromMapEntryId(String entryId) {
+    String userId = null;
+    String mapId = null;
+    if (DEBUG) {
+      Log.d("Maps GData Client", "Getting mapid from entry id: " + entryId);
+    }
+    int userIdStart =
+        entryId.indexOf(MAP_ENTRY_ID_BEFORE_USER_ID)
+            + MAP_ENTRY_ID_BEFORE_USER_ID.length();
+    int userIdEnd =
+        entryId.indexOf(MAP_ENTRY_ID_BETWEEN_USER_ID_AND_MAP_ID, userIdStart);
+    if (userIdStart >= 0 && userIdEnd < entryId.length()
+        && userIdStart <= userIdEnd) {
+      userId = entryId.substring(userIdStart, userIdEnd);
+    }
+    int mapIdStart =
+        entryId.indexOf(MAP_ENTRY_ID_BETWEEN_USER_ID_AND_MAP_ID, userIdEnd)
+            + MAP_ENTRY_ID_BETWEEN_USER_ID_AND_MAP_ID.length();
+    if (mapIdStart >= 0 && mapIdStart < entryId.length()) {
+      mapId = entryId.substring(mapIdStart);
+    }
+    if (userId == null) {
+      userId = "";
+    }
+    if (mapId == null) {
+      mapId = "";
+    }
+    if (DEBUG) {
+      Log.d("Maps GData Client", "Got user id: " + userId);
+      Log.d("Maps GData Client", "Got map id: " + mapId);
+    }
+    return userId + "." + mapId;
+  }
+
+  public static String getVersionFeed(String versionUserId,
+      String versionClient, String currentVersion) {
+    return String.format(MAPS_VERSION_FEED_PATH_FORMAT,
+                         MAPS_BASE_FEED_URL, versionUserId,
+                         versionClient, currentVersion);
+  }
+
+}

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java

@@ -0,0 +1,372 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+import com.google.android.apps.mytracks.content.Waypoint;
+import com.google.android.apps.mytracks.io.AuthManager;
+import com.google.android.maps.GeoPoint;
+import com.google.android.maps.mytracks.R;
+import com.google.wireless.gdata.client.HttpException;
+import com.google.wireless.gdata.data.Entry;
+import com.google.wireless.gdata.parser.GDataParser;
+import com.google.wireless.gdata.parser.ParseException;
+
+import android.content.Context;
+import android.location.Location;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+/**
+ * Single interface which abstracts all access to the Google Maps service.
+ *
+ * @author Rodrigo Damazio
+ */
+public class MapsFacade {
+
+  /**
+   * Interface for receiving data back from getMapsList.
+   * All calls to the interface will happen before getMapsList returns.
+   */
+  public interface MapsListCallback {
+    void onReceivedMapListing(String mapId, String title, String description,
+        boolean isPublic);
+  }
+
+  private static final String END_ICON_URL =
+    "http://maps.google.com/mapfiles/ms/micons/red-dot.png";
+  private static final String START_ICON_URL =
+    "http://maps.google.com/mapfiles/ms/micons/green-dot.png";
+  
+  private final Context context;
+  private final MyMapsGDataWrapper wrapper;
+  private final MyMapsGDataConverter gdataConverter;
+  private final String authToken;
+
+  public MapsFacade(Context context, AuthManager auth) {
+    this.context = context;
+    this.authToken = auth.getAuthToken();
+
+    wrapper = new MyMapsGDataWrapper(context, auth);
+    wrapper.setRetryOnAuthFailure(true);
+
+    try {
+      gdataConverter = new MyMapsGDataConverter();
+    } catch (XmlPullParserException e) {
+      throw new IllegalStateException("Unable to create maps data converter", e);
+    }
+  }
+
+  public static String buildMapUrl(String mapId) {
+    return MapsClient.buildMapUrl(mapId);
+  }
+
+  /**
+   * Returns a list of all maps for the current user.
+   *
+   * @param callback callback to call for each map returned
+   * @return true on success, false otherwise
+   */
+  public boolean getMapsList(final MapsListCallback callback) {
+    return wrapper.runQuery(new MyMapsGDataWrapper.QueryFunction() {
+      @Override
+      public void query(MapsClient client) throws IOException, Exception {
+        GDataParser listParser = client.getParserForFeed(
+            MapFeatureEntry.class, MapsClient.getMapsFeed(), authToken);
+        listParser.init();
+        while (listParser.hasMoreData()) {
+          MapFeatureEntry entry =
+              (MapFeatureEntry) listParser.readNextEntry(null);
+          MyMapsMapMetadata metadata =
+              MyMapsGDataConverter.getMapMetadataForEntry(entry);
+          String mapId = MyMapsGDataConverter.getMapidForEntry(entry);
+
+          callback.onReceivedMapListing(
+              mapId, metadata.getTitle(), metadata.getDescription(), metadata.getSearchable());
+        }
+        listParser.close();
+        listParser = null;
+      }
+    });
+  }
+
+  /**
+   * Creates a new map for the current user.
+   *
+   * @param title title of the map
+   * @param category category of the map
+   * @param description description for the map
+   * @param isPublic whether the map should be public
+   * @param mapIdBuilder builder to append the map ID to
+   * @return true on success, false otherwise
+   */
+  public boolean createNewMap(
+      final String title, final String category, final String description,
+      final boolean isPublic, final StringBuilder mapIdBuilder) {
+    if (mapIdBuilder.length() > 0) {
+      throw new IllegalArgumentException("mapIdBuilder should be empty");
+    }
+
+    return wrapper.runQuery(new MyMapsGDataWrapper.QueryFunction() {
+      @Override
+      public void query(MapsClient client) throws IOException, Exception {
+        Log.d(MyMapsConstants.TAG, "Creating a new map.");
+        String mapFeed = MapsClient.getMapsFeed();
+        Log.d(MyMapsConstants.TAG, "Map feed is " + mapFeed);
+        MyMapsMapMetadata metaData = new MyMapsMapMetadata();
+        metaData.setTitle(title);
+        metaData.setDescription(description + " - "
+            + category + " - " + context.getString(R.string.new_map_description));
+        metaData.setSearchable(isPublic);
+        Entry entry = MyMapsGDataConverter.getMapEntryForMetadata(metaData);
+        Log.d(MyMapsConstants.TAG, "Title: " + entry.getTitle());
+        Entry map = client.createEntry(mapFeed, authToken, entry);
+
+        String mapId = MapsClient.getMapIdFromMapEntryId(map.getId());
+        mapIdBuilder.append(mapId);
+        Log.d(MyMapsConstants.TAG, "New map id is: " + mapId);
+      }
+    });
+  }
+
+  /**
+   * Uploads a single start or end marker to the given map.
+   *
+   * @param mapId ID of the map to upload to
+   * @param trackName name of the track being started/ended
+   * @param trackDescription description of the track being started/ended
+   * @param location the location of the marker
+   * @param isStart true to add a start marker, false to add an end marker
+   * @return true on success, false otherwise
+   */
+  public boolean uploadMarker(final String mapId, final String trackName,
+      final String trackDescription, final Location loc, final boolean isStart) {
+    return wrapper.runQuery(new MyMapsGDataWrapper.QueryFunction() {
+      @Override
+      public void query(MapsClient client)
+          throws IOException, Exception {
+        String featureFeed = MapsClient.getFeaturesFeed(mapId);
+        GeoPoint geoPoint = getGeoPoint(loc);
+        insertMarker(client, featureFeed, trackName, trackDescription, geoPoint, isStart);
+      }
+    });
+  }
+
+  /**
+   * Inserts a place mark. Second try if 1st try fails. Will throw exception on
+   * 2nd failure.
+   */
+  private void insertMarker(MapsClient client,
+                            String featureFeed,
+                            String trackName, String trackDescription,
+                            GeoPoint geoPoint,
+                            boolean isStart) throws IOException, Exception {
+    MyMapsFeature feature =
+        buildMyMapsPlacemarkFeature(trackName, trackDescription, geoPoint, isStart);
+    Entry entry = gdataConverter.getEntryForFeature(feature);
+    Log.d(MyMapsConstants.TAG, "SendToMyMaps: Creating placemark "
+        + entry.getTitle());
+    try {
+      client.createEntry(featureFeed, authToken, entry);
+      Log.d(MyMapsConstants.TAG, "SendToMyMaps: createEntry success!");
+    } catch (IOException e) {
+      Log.w(MyMapsConstants.TAG,
+          "SendToMyMaps: createEntry 1st try failed. Trying again.");
+      // Retry once (often IOException is thrown on a timeout):
+      client.createEntry(featureFeed, authToken, entry);
+      Log.d(MyMapsConstants.TAG,
+          "SendToMyMaps: createEntry success on 2nd try!");
+    }
+  }
+
+  /**
+   * Builds a placemark MyMapsFeature from a track.
+   *
+   * @param track the track
+   * @param isStart true if it's the start of the track, or false for end
+   * @return a MyMapsFeature
+   */
+  private MyMapsFeature buildMyMapsPlacemarkFeature(
+      String trackName, String trackDescription,
+      GeoPoint geoPoint, boolean isStart) {
+    String iconUrl;
+    if (isStart) {
+      iconUrl = START_ICON_URL;
+    } else {
+      iconUrl = END_ICON_URL;
+    }
+    String title = trackName + " "
+        + (isStart ? context.getString(R.string.start)
+                   : context.getString(R.string.end));
+    String description = isStart ? "" : trackDescription;
+    return buildMyMapsPlacemarkFeature(title, description, iconUrl, geoPoint);
+  }
+
+  /**
+   * Builds a MyMapsFeature from a track.
+   *
+   * @param wpt the waypoint
+   * @return a MyMapsFeature
+   */
+  private static MyMapsFeature buildMyMapsPlacemarkFeature(
+      String title, String description, String iconUrl, GeoPoint geoPoint) {
+    MyMapsFeature myMapsFeature = new MyMapsFeature();
+    myMapsFeature.generateAndroidId();
+    myMapsFeature.setType(MyMapsFeature.MARKER);
+    myMapsFeature.setIconUrl(iconUrl);
+    myMapsFeature.setDescription(description);
+    myMapsFeature.addPoint(geoPoint);
+    if (TextUtils.isEmpty(title)) {
+      // Features must have a name (otherwise GData upload may fail):
+      myMapsFeature.setTitle("-");
+    } else {
+      myMapsFeature.setTitle(title);
+    }
+    myMapsFeature.setDescription(description.replaceAll("\n", "<br>"));
+    return myMapsFeature;
+  }
+
+  /**
+   * Uploads a series of waypoints to the given map.
+   *
+   * @param mapId ID of the map to upload to
+   * @param waypoints the waypoints to upload
+   * @return true on success, false otherwise
+   */
+  public boolean uploadWaypoints(
+      final String mapId, final Iterable<Waypoint> waypoints) {
+    return wrapper.runQuery(new MyMapsGDataWrapper.QueryFunction() {
+      public void query(MapsClient client) {
+        // TODO(rdamazio): Stream through the waypoints in chunks.
+        // I am leaving the number of waypoints very high which should not be a
+        // problem because we don't try to load them into objects all at the
+        // same time.
+        String featureFeed = MapsClient.getFeaturesFeed(mapId);
+
+        try {
+          for (Waypoint waypoint : waypoints) {
+            MyMapsFeature feature = buildMyMapsPlacemarkFeature(
+                waypoint.getName(), waypoint.getDescription(), waypoint.getIcon(),
+                getGeoPoint(waypoint.getLocation()));
+            Entry entry = gdataConverter.getEntryForFeature(feature);
+
+            Log.d(MyMapsConstants.TAG,
+                "SendToMyMaps: Creating waypoint.");
+            try {
+              client.createEntry(featureFeed, authToken, entry);
+              Log.d(MyMapsConstants.TAG,
+                  "SendToMyMaps: createEntry success!");
+            } catch (IOException e) {
+              Log.w(MyMapsConstants.TAG,
+                  "SendToMyMaps: createEntry 1st try failed. Retrying.");
+    
+              // Retry once (often IOException is thrown on a timeout):
+              client.createEntry(featureFeed, authToken, entry);
+              Log.d(MyMapsConstants.TAG,
+                  "SendToMyMaps: createEntry success on 2nd try!");
+            }
+          }
+        } catch (ParseException e) {
+          Log.w(MyMapsConstants.TAG, "ParseException caught.", e);
+        } catch (HttpException e) {
+          Log.w(MyMapsConstants.TAG, "HttpException caught.", e);
+        } catch (IOException e) {
+          Log.w(MyMapsConstants.TAG, "IOException caught.", e);
+        }
+      }
+    });
+  }
+
+  /**
+   * Uploads a series of points to the given map.
+   *
+   * @param mapId ID of the map to upload to
+   * @param trackName the name of the track
+   * @param locations the locations to upload
+   * @return true on success, false otherwise
+   */
+  public boolean uploadTrackPoints(
+      final String mapId, final String trackName, final Collection<Location> locations) {
+    return wrapper.runQuery(new MyMapsGDataWrapper.QueryFunction() {
+      @Override
+      public void query(MapsClient client)
+          throws IOException, Exception {
+        String featureFeed = MapsClient.getFeaturesFeed(mapId);
+        Log.d(MyMapsConstants.TAG, "Feature feed url: " + featureFeed);
+        uploadTrackPoints(client, featureFeed, trackName, locations);
+      }
+    });
+  }
+
+  private boolean uploadTrackPoints(
+      MapsClient client,
+      String featureFeed,
+      String trackName, Collection<Location> locations)
+      throws IOException, Exception  {
+    Entry entry = null;
+    int numLocations = locations.size();
+    if (numLocations < 2) {
+      // Need at least two points for a polyline:
+      Log.w(MyMapsConstants.TAG, "Not uploading too few points");
+      return true;
+    }
+  
+    // Put the line:
+    entry = gdataConverter.getEntryForFeature(
+        buildMyMapsLineFeature(trackName, locations));
+    Log.d(MyMapsConstants.TAG,
+        "SendToMyMaps: Creating line " + entry.getTitle());
+    try {
+      client.createEntry(featureFeed, authToken, entry);
+      Log.d(MyMapsConstants.TAG, "SendToMyMaps: createEntry success!");
+    } catch (IOException e) {
+      Log.w(MyMapsConstants.TAG,
+          "SendToMyMaps: createEntry 1st try failed. Trying again.");
+      // Retry once (often IOException is thrown on a timeout):
+      client.createEntry(featureFeed, authToken, entry);
+      Log.d(MyMapsConstants.TAG,
+          "SendToMyMaps: createEntry success on 2nd try!");
+    }
+    return true;
+  }
+
+  /**
+   * Builds a MyMapsFeature from a track.
+   *
+   * @param track the track
+   * @return a MyMapsFeature
+   */
+  private static MyMapsFeature buildMyMapsLineFeature(String trackName,
+      Iterable<Location> locations) {
+    MyMapsFeature myMapsFeature = new MyMapsFeature();
+    myMapsFeature.generateAndroidId();
+    myMapsFeature.setType(MyMapsFeature.LINE);
+    if (TextUtils.isEmpty(trackName)) {
+      // Features must have a name (otherwise GData upload may fail):
+      myMapsFeature.setTitle("-");
+    } else {
+      myMapsFeature.setTitle(trackName);
+    }
+    myMapsFeature.setColor(0x80FF0000);
+    for (Location loc : locations) {
+      myMapsFeature.addPoint(getGeoPoint(loc));
+    }
+    return myMapsFeature;
+  }
+
+  /**
+   * Cleans up after a series of uploads.
+   * This closes the connection to Maps and resets retry counters.
+   */
+  public void cleanUp() {
+    wrapper.cleanUp();
+  }
+
+  private static GeoPoint getGeoPoint(Location location) {
+    return new GeoPoint((int) (location.getLatitude() * 1E6),
+                        (int) (location.getLongitude() * 1E6));
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MyMapsConstants.java

@@ -0,0 +1,17 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+/**
+ * Constants for My Maps.
+ */
+public class MyMapsConstants {
+  static final String TAG = "MapsApi";
+  static final String MAPSHOP_BASE_URL =
+      "http://maps.google.com/maps/ms";
+  public static final String SERVICE_NAME = "local";
+
+  /**
+   * Private constructor to prevent instantiation.
+   */
+  private MyMapsConstants() { }
+}

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MyMapsFeature.java

@@ -0,0 +1,233 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+import com.google.android.maps.GeoPoint;
+
+import java.io.Serializable;
+import java.util.Vector;
+
+/**
+ * MyMapsFeature contains all of the data associated with a feature in My Maps,
+ * where a feature is a marker, line, or shape. Some of the data is stored in a
+ * {@link MyMapsFeatureMetadata} object so that it can be more efficiently
+ * transmitted to other activities.
+ */
+class MyMapsFeature implements Serializable {
+
+  private static final long serialVersionUID = 8439035544430497236L;
+
+  /** A marker feature displays an icon at a single point on the map. */
+  public static final int MARKER = 0;
+
+  /**
+   * A line feature displays a line connecting a set of points on the map.
+   */
+  public static final int LINE = 1;
+
+  /**
+   * A shape feature displays a border defined by connecting a set of points,
+   * including connecting the last to the first, and displays the area
+   * confined by this border.
+   */
+  public static final int SHAPE = 2;
+
+  /** The local feature id for this feature, if needed. */
+  private String androidId;
+
+  /**
+   * The latitudes of the points of this feature in order, specified in
+   * millionths of a degree north.
+   */
+  private final Vector<Integer> latitudeE6 = new Vector<Integer>();
+
+  /**
+   * The longitudes of the points of this feature in order, specified in
+   * millionths of a degree east.
+   */
+  private final Vector<Integer> longitudeE6 = new Vector<Integer>();
+
+  /** The metadata of this feature in a format efficient for transmission. */
+  private MyMapsFeatureMetadata featureInfo = new MyMapsFeatureMetadata();
+
+  /**
+   * Initializes a valid but empty feature. It will default to a
+   * {@link #MARKER} with a blue placemark with a dot as an icon at the
+   * location (0, 0).
+   */
+  public MyMapsFeature() {
+  }
+
+  /**
+   * Adds a new point to the end of this feature.
+   *
+   * @param point The new point to add
+   */
+  public synchronized void addPoint(GeoPoint point) {
+    latitudeE6.add(point.getLatitudeE6());
+    longitudeE6.add(point.getLongitudeE6());
+  }
+
+  /**
+   * Generates a new local id for this feature based on the current time and
+   * a random number.
+   */
+  public synchronized void generateAndroidId() {
+    Long time = System.currentTimeMillis();
+    Integer random = (int) (Math.random() * 10000);
+    androidId = time.toString() + "." + random.toString();
+  }
+
+  /**
+   * Retrieves the current local id for this feature if one is available.
+   *
+   * @return The local id for this feature
+   */
+  public String getAndroidId() {
+    return androidId;
+  }
+
+  /**
+   * Retrieves the current (html) description of this feature. The description
+   * is stored in the feature metadata.
+   *
+   * @return The description of this feature
+   */
+  public String getDescription() {
+    return featureInfo.getDescription();
+  }
+
+  /**
+   * Sets the description of this feature. That description is stored in the
+   * feature metadata.
+   *
+   * @param description The new description of this feature
+   */
+  public synchronized void setDescription(String description) {
+    featureInfo.setDescription(description);
+  }
+
+  /**
+   * Retrieves the point at the given index for this feature.
+   *
+   * @param index The index of the point desired
+   * @return A {@link GeoPoint} representing the point or null if that point
+   *         doesn't exist
+   */
+  public GeoPoint getPoint(int index) {
+    if (latitudeE6.size() <= index) {
+      return null;
+    }
+    return new GeoPoint(latitudeE6.get(index), longitudeE6.get(index));
+  }
+
+  /**
+   * Counts the number of points in this feature and return that count.
+   *
+   * @return The number of points in this feature
+   */
+  public int getPointCount() {
+    return latitudeE6.size();
+  }
+
+  /**
+   * Retrieves the title of this feature. That title is stored in the feature
+   * metadata.
+   *
+   * @return the current title of this feature
+   */
+  public String getTitle() {
+    return featureInfo.getTitle();
+  }
+
+  /**
+   * Retrieves the type of this feature. That type is stored in the feature
+   * metadata.
+   *
+   * @return One of {@link #MARKER}, {@link #LINE}, or {@link #SHAPE}
+   *         identifying the type of this feature
+   */
+  public int getType() {
+    return featureInfo.getType();
+  }
+
+  /**
+   * Retrieves the current color of this feature as an ARGB color integer.
+   * That color is stored in the feature metadata.
+   *
+   * @return The ARGB color of this feature
+   */
+  public int getColor() {
+    return featureInfo.getColor();
+  }
+
+  /**
+   * Retrieves the current line width of this feature. That line width is
+   * stored in the feature metadata.
+   *
+   * @return The line width of this feature
+   */
+  public int getLineWidth() {
+    return featureInfo.getLineWidth();
+  }
+
+  /**
+   * Retrieves the current fill color of this feature as an ARGB color
+   * integer. That color is stored in the feature metadata.
+   *
+   * @return The ARGB fill color of this feature
+   */
+  public int getFillColor() {
+    return featureInfo.getFillColor();
+  }
+
+  /**
+   * Retrieves the current icon url of this feature. That icon url is stored
+   * in the feature metadata.
+   *
+   * @return The icon url for this feature
+   */
+  public String getIconUrl() {
+    return featureInfo.getIconUrl();
+  }
+
+  /**
+   * Sets the title of this feature. That title is stored in the feature
+   * metadata.
+   *
+   * @param title The new title of this feature
+   */
+  public synchronized void setTitle(String title) {
+    featureInfo.setTitle(title);
+  }
+
+  /**
+   * Sets the type of this feature. That type is stored in the feature
+   * metadata.
+   *
+   * @param type The new type of the feature. That type must be one of
+   *        {@link #MARKER}, {@link #LINE}, or {@link #SHAPE}
+   */
+  public synchronized void setType(int type) {
+    featureInfo.setType(type);
+  }
+
+  /**
+   * Sets the ARGB color of this feature. That color is stored in the feature
+   * metadata.
+   *
+   * @param color The new ARGB color of this feature
+   */
+  public synchronized void setColor(int color) {
+    featureInfo.setColor(color);
+  }
+
+  /**
+   * Sets the icon url of this feature. That icon url is stored in the feature
+   * metadata.
+   *
+   * @param url The new icon url of the feature
+   */
+  public synchronized void setIconUrl(String url) {
+    featureInfo.setIconUrl(url);
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MyMapsFeatureMetadata.java

@@ -0,0 +1,87 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+/**
+ * Metadata about a maps feature.
+ */
+class MyMapsFeatureMetadata {
+
+  private static final String BLUE_DOT_URL =
+      "http://maps.google.com/mapfiles/ms/micons/blue-dot.png";
+  private static final int DEFAULT_COLOR = 0x800000FF;
+  private static final int DEFAULT_FILL_COLOR = 0xC00000FF;
+
+  private String title;
+  private String description;
+  private int type;
+  private int color;
+  private int lineWidth;
+  private int fillColor;
+  private String iconUrl;
+
+  public MyMapsFeatureMetadata() {
+    title = "";
+    description = "";
+    type = MyMapsFeature.MARKER;
+    color = DEFAULT_COLOR;
+    lineWidth = 5;
+    fillColor = DEFAULT_FILL_COLOR;
+    iconUrl = BLUE_DOT_URL;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public int getType() {
+    return type;
+  }
+
+  public void setType(int type) {
+    this.type = type;
+  }
+
+  public int getColor() {
+    return color;
+  }
+
+  public void setColor(int color) {
+    this.color = color;
+  }
+
+  public int getLineWidth() {
+    return lineWidth;
+  }
+
+  public void setLineWidth(int width) {
+    lineWidth = width;
+  }
+
+  public int getFillColor() {
+    return fillColor;
+  }
+
+  public void setFillColor(int color) {
+    fillColor = color;
+  }
+
+  public String getIconUrl() {
+    return iconUrl;
+  }
+
+  public void setIconUrl(String url) {
+    iconUrl = new String(url);
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MyMapsGDataConverter.java

@@ -0,0 +1,183 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+import com.google.wireless.gdata.data.Entry;
+import com.google.wireless.gdata.data.StringUtils;
+
+import android.graphics.Color;
+import android.util.Log;
+
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+/**
+ * Converter from GData objects to MyMaps objects.
+ */
+class MyMapsGDataConverter {
+
+  private final XmlSerializer xmlSerializer;
+
+  public MyMapsGDataConverter() throws XmlPullParserException {
+    xmlSerializer = XmlPullParserFactory.newInstance().newSerializer();
+  }
+
+  public static MyMapsMapMetadata getMapMetadataForEntry(
+      MapFeatureEntry entry) {
+    MyMapsMapMetadata metadata = new MyMapsMapMetadata();
+    if ("public".equals(entry.getPrivacy())) {
+      metadata.setSearchable(true);
+    } else {
+      metadata.setSearchable(false);
+    }
+    metadata.setTitle(entry.getTitle());
+
+    String desc = entry.getContent();
+    if (desc.length() > 12) {
+      metadata.setDescription(desc.substring(9, desc.length() - 3));
+    }
+
+    String editUri = entry.getEditUri();
+    if (editUri != null) {
+      metadata.setGDataEditUri(editUri);
+    }
+
+    return metadata;
+  }
+
+  public static String getMapidForEntry(Entry entry) {
+    return MapsClient.getMapIdFromMapEntryId(entry.getId());
+  }
+
+  public static Entry getMapEntryForMetadata(MyMapsMapMetadata metadata) {
+    MapFeatureEntry entry = new MapFeatureEntry();
+    entry.setEditUri(metadata.getGDataEditUri());
+    entry.setTitle(metadata.getTitle());
+    entry.setContent(metadata.getDescription());
+    entry.setPrivacy(metadata.getSearchable() ? "public" : "unlisted");
+    entry.setAuthor("android");
+    entry.setEmail("nobody@google.com");
+    return entry;
+  }
+
+  public MapFeatureEntry getEntryForFeature(MyMapsFeature feature) {
+    MapFeatureEntry entry = new MapFeatureEntry();
+    entry.setTitle(feature.getTitle());
+    entry.setAuthor("android");
+    entry.setEmail("nobody@google.com");
+    entry.setCategoryScheme("http://schemas.google.com/g/2005#kind");
+    entry.setCategory("http://schemas.google.com/g/2008#mapfeature");
+    entry.setEditUri("");
+    if (!StringUtils.isEmpty(feature.getAndroidId())) {
+      entry.setAttribute("_androidId", feature.getAndroidId());
+    }
+    try {
+      StringWriter writer = new StringWriter();
+      xmlSerializer.setOutput(writer);
+      xmlSerializer.startTag(null, "Placemark");
+      xmlSerializer.attribute(null, "xmlns", "http://earth.google.com/kml/2.2");
+      xmlSerializer.startTag(null, "Style");
+      if (feature.getType() == MyMapsFeature.MARKER) {
+        xmlSerializer.startTag(null, "IconStyle");
+        xmlSerializer.startTag(null, "Icon");
+        xmlSerializer.startTag(null, "href");
+        xmlSerializer.text(feature.getIconUrl());
+        xmlSerializer.endTag(null, "href");
+        xmlSerializer.endTag(null, "Icon");
+        xmlSerializer.endTag(null, "IconStyle");
+      } else {
+        xmlSerializer.startTag(null, "LineStyle");
+        xmlSerializer.startTag(null, "color");
+        int color = feature.getColor();
+        // Reverse the color because KML is ABGR and Android is ARGB
+        xmlSerializer.text(Integer.toHexString(
+            Color.argb(Color.alpha(color), Color.blue(color),
+            Color.green(color), Color.red(color))));
+        xmlSerializer.endTag(null, "color");
+        xmlSerializer.startTag(null, "width");
+        xmlSerializer.text(Integer.toString(feature.getLineWidth()));
+        xmlSerializer.endTag(null, "width");
+        xmlSerializer.endTag(null, "LineStyle");
+
+        if (feature.getType() == MyMapsFeature.SHAPE) {
+          xmlSerializer.startTag(null, "PolyStyle");
+          xmlSerializer.startTag(null, "color");
+          int fcolor = feature.getFillColor();
+          // Reverse the color because KML is ABGR and Android is ARGB
+          xmlSerializer.text(Integer.toHexString(Color.argb(Color.alpha(fcolor),
+              Color.blue(fcolor), Color.green(fcolor), Color.red(fcolor))));
+          xmlSerializer.endTag(null, "color");
+          xmlSerializer.startTag(null, "fill");
+          xmlSerializer.text("1");
+          xmlSerializer.endTag(null, "fill");
+          xmlSerializer.startTag(null, "outline");
+          xmlSerializer.text("1");
+          xmlSerializer.endTag(null, "outline");
+          xmlSerializer.endTag(null, "PolyStyle");
+        }
+      }
+      xmlSerializer.endTag(null, "Style");
+      xmlSerializer.startTag(null, "name");
+      xmlSerializer.text(feature.getTitle());
+      xmlSerializer.endTag(null, "name");
+      xmlSerializer.startTag(null, "description");
+      xmlSerializer.cdsect(feature.getDescription());
+      xmlSerializer.endTag(null, "description");
+      StringBuilder pointBuilder = new StringBuilder();
+      for (int i = 0; i < feature.getPointCount(); ++i) {
+        if (i > 0) {
+          pointBuilder.append('\n');
+        }
+        pointBuilder.append(feature.getPoint(i).getLongitudeE6() / 1e6);
+        pointBuilder.append(',');
+        pointBuilder.append(feature.getPoint(i).getLatitudeE6() / 1e6);
+        pointBuilder.append(",0.000000");
+      }
+      String pointString = pointBuilder.toString();
+      if (feature.getType() == MyMapsFeature.MARKER) {
+        xmlSerializer.startTag(null, "Point");
+        xmlSerializer.startTag(null, "coordinates");
+        xmlSerializer.text(pointString);
+        xmlSerializer.endTag(null, "coordinates");
+        xmlSerializer.endTag(null, "Point");
+      } else if (feature.getType() == MyMapsFeature.LINE) {
+        xmlSerializer.startTag(null, "LineString");
+        xmlSerializer.startTag(null, "tessellate");
+        xmlSerializer.text("1");
+        xmlSerializer.endTag(null, "tessellate");
+        xmlSerializer.startTag(null, "coordinates");
+        xmlSerializer.text(pointString);
+        xmlSerializer.endTag(null, "coordinates");
+        xmlSerializer.endTag(null, "LineString");
+      } else {
+        xmlSerializer.startTag(null, "Polygon");
+        xmlSerializer.startTag(null, "outerBoundaryIs");
+        xmlSerializer.startTag(null, "LinearRing");
+        xmlSerializer.startTag(null, "tessellate");
+        xmlSerializer.text("1");
+        xmlSerializer.endTag(null, "tessellate");
+        xmlSerializer.startTag(null, "coordinates");
+        xmlSerializer.text(pointString + "\n"
+            + Double.toString(feature.getPoint(0).getLongitudeE6() / 1e6)
+            + ","
+            + Double.toString(feature.getPoint(0).getLatitudeE6() / 1e6)
+            + ",0.000000");
+        xmlSerializer.endTag(null, "coordinates");
+        xmlSerializer.endTag(null, "LinearRing");
+        xmlSerializer.endTag(null, "outerBoundaryIs");
+        xmlSerializer.endTag(null, "Polygon");
+      }
+      xmlSerializer.endTag(null, "Placemark");
+      xmlSerializer.flush();
+      entry.setContent(writer.toString());
+      Log.d("My Google Maps", "Generated kml:\n" + entry.getContent());
+      Log.d("My Google Maps", "Edit URI: " + entry.getEditUri());
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return entry;
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MyMapsGDataWrapper.java

@@ -0,0 +1,169 @@
+// Copyright 2010 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+import com.google.android.apps.mytracks.io.AuthManager;
+import com.google.android.apps.mytracks.io.gdata.GDataClientFactory;
+import com.google.android.common.gdata.AndroidXmlParserFactory;
+import com.google.wireless.gdata.client.GDataClient;
+import com.google.wireless.gdata.client.HttpException;
+import com.google.wireless.gdata.parser.xml.SimplePullParser.ParseException;
+import com.google.wireless.gdata2.ConflictDetectedException;
+import com.google.wireless.gdata2.client.AuthenticationException;
+
+import android.content.Context;
+import android.util.Log;
+
+import java.io.IOException;
+
+/**
+ * MyMapsGDataWrapper provides a wrapper around GData operations that maintains
+ * the GData client, and provides a method to run gdata queries with proper
+ * error handling. After a query is run, the wrapper can be queried about the
+ * error that occurred.
+ */
+class MyMapsGDataWrapper {
+  /**
+   * A QueryFunction is passed in when executing a query. The query function
+   * of the class is called with the GData client as a parameter. The
+   * function should execute whatever operations it desires on the client
+   * without concern for whether the client will throw an error.
+   */
+  interface QueryFunction {
+    public abstract void query(MapsClient client)
+        throws AuthenticationException, IOException, ParseException,
+        ConflictDetectedException, Exception;
+  }
+
+  // The types of error that may be encountered
+  /** No error occurred. */
+  public static final int ERROR_NO_ERROR = 0;
+  /** There was an authentication error, the auth token may be invalid. */
+  public static final int ERROR_AUTH = 1;
+  /** There was an internal error on the server side. */
+  public static final int ERROR_INTERNAL = 2;
+  /** There was an error connecting to the server. */
+  public static final int ERROR_CONNECTION = 3;
+  /** The item queried did not exit. */
+  public static final int ERROR_NOT_FOUND = 4;
+  /** There was an error parsing or serializing locally. */
+  public static final int ERROR_LOCAL = 5;
+  /** There was a conflict, update the entry and try again. */
+  public static final int ERROR_CONFLICT = 6;
+  /**
+   * A query was run after cleaning up the wrapper, so the client was invalid.
+   */
+  public static final int ERROR_CLEANED_UP = 7;
+  /** An unknown error occurred. */
+  public static final int ERROR_UNKNOWN = 100;
+
+  private final GDataClient androidGdataClient;
+  private final AuthManager auth;
+  private final MapsClient client;
+
+  private String errorMessage;
+  private int errorType;
+  private boolean retryOnAuthFailure;
+  private int retriesPending;
+  private boolean cleanupCalled;
+
+  public MyMapsGDataWrapper(Context context, AuthManager auth) {
+    androidGdataClient = GDataClientFactory.getGDataClient(context);
+    this.auth = auth;
+    client =
+        new MapsClient(androidGdataClient, new XmlMapsGDataParserFactory(
+            new AndroidXmlParserFactory()));
+    errorType = ERROR_NO_ERROR;
+    errorMessage = null;
+    retryOnAuthFailure = false;
+    retriesPending = 0;
+    cleanupCalled = false;
+  }
+
+  public boolean runQuery(final QueryFunction query) {
+    if (client == null) {
+      errorType = ERROR_CLEANED_UP;
+      errorMessage = "GData Wrapper has already been cleaned up!";
+      return false;
+    }
+    try {
+      query.query(client);
+      errorType = ERROR_NO_ERROR;
+      errorMessage = null;
+      return true;
+    } catch (AuthenticationException e) {
+      Log.e(MyMapsConstants.TAG, "Exception", e);
+      errorType = ERROR_AUTH;
+      errorMessage = e.getMessage();
+    } catch (HttpException e) {
+      Log.e(MyMapsConstants.TAG, "HttpException", e);
+      errorMessage = e.getMessage();
+      if (errorMessage != null && errorMessage.contains("401")) {
+        errorType = ERROR_AUTH;
+      } else {
+        errorType = ERROR_CONNECTION;
+      }
+    } catch (IOException e) {
+      Log.e(MyMapsConstants.TAG, "Exception", e);
+      errorMessage = e.getMessage();
+      if (errorMessage != null && errorMessage.contains("503")) {
+        errorType = ERROR_INTERNAL;
+      } else {
+        errorType = ERROR_CONNECTION;
+      }
+    } catch (ParseException e) {
+      Log.e(MyMapsConstants.TAG, "Exception", e);
+      errorType = ERROR_LOCAL;
+      errorMessage = e.getMessage();
+    } catch (ConflictDetectedException e) {
+      Log.e(MyMapsConstants.TAG, "Exception", e);
+      errorType = ERROR_CONFLICT;
+      errorMessage = e.getMessage();
+    } catch (Exception e) {
+      Log.e(MyMapsConstants.TAG, "Exception", e);
+      errorType = ERROR_UNKNOWN;
+      errorMessage = e.getMessage();
+      e.printStackTrace();
+    }
+    Log.d(MyMapsConstants.TAG, "GData error encountered: " + errorMessage);
+    if (errorType == ERROR_AUTH && auth != null) {
+      Runnable whenFinished = null;
+      if (retryOnAuthFailure) {
+        retriesPending++;
+        whenFinished = new Runnable() {
+          public void run() {
+            retriesPending--;
+            retryOnAuthFailure = false;
+            runQuery(query);
+            if (cleanupCalled && retriesPending == 0) {
+              cleanUp();
+            }
+          }
+        };
+      }
+      auth.invalidateAndRefresh(whenFinished);
+    }
+    return false;
+  }
+
+  public int getErrorType() {
+    return errorType;
+  }
+
+  public String getErrorMessage() {
+    return errorMessage;
+  }
+
+  // cleanUp must be called when done using this wrapper to close the client.
+  // Note that the cleanup will be delayed if auth failure retries were
+  // requested and there is a pending retry.
+  public void cleanUp() {
+    if (retriesPending == 0 && !cleanupCalled) {
+      androidGdataClient.close();
+    }
+    cleanupCalled = true;
+  }
+
+  public void setRetryOnAuthFailure(boolean retry) {
+    retryOnAuthFailure = retry;
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MyMapsMapMetadata.java

@@ -0,0 +1,52 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+/**
+ * Metadata about a "my maps" map.
+ */
+class MyMapsMapMetadata {
+
+  private String title;
+  private String description;
+  private String gdataEditUri;
+  private boolean searchable;
+
+  public MyMapsMapMetadata() {
+    title = "";
+    description = "";
+    gdataEditUri = "";
+    searchable = false;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = new String(title);
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = new String(description);
+  }
+
+  public boolean getSearchable() {
+    return searchable;
+  }
+
+  public void setSearchable(boolean searchable) {
+    this.searchable = searchable;
+  }
+
+  public String getGDataEditUri() {
+    return gdataEditUri;
+  }
+
+  public void setGDataEditUri(String editUri) {
+    this.gdataEditUri = new String(editUri);
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/XmlMapsGDataParser.java

@@ -0,0 +1,163 @@
+// Copyright 2009 Google Inc. All Rights Reserved.
+package com.google.android.apps.mytracks.io.mymaps;
+
+import com.google.wireless.gdata.data.Entry;
+import com.google.wireless.gdata.data.Feed;
+import com.google.wireless.gdata.data.XmlUtils;
+import com.google.wireless.gdata.parser.ParseException;
+import com.google.wireless.gdata.parser.xml.XmlGDataParser;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Parser for XML gdata maps data.
+ */
+class XmlMapsGDataParser extends XmlGDataParser {
+
+  public XmlMapsGDataParser(InputStream is, XmlPullParser xpp)
+      throws ParseException {
+    super(is, xpp);
+  }
+
+  @Override
+  protected Feed createFeed() {
+    return new Feed();
+  }
+
+  @Override
+  protected Entry createEntry() {
+    return new MapFeatureEntry();
+  }
+
+  @Override
+  protected void handleExtraElementInFeed(Feed feed) {
+    // Do nothing
+  }
+
+  @Override
+  protected void handleExtraLinkInEntry(
+      String rel, String type, String href, Entry entry)
+      throws XmlPullParserException, IOException {
+    if (!(entry instanceof MapFeatureEntry)) {
+      throw new IllegalArgumentException("Expected MapFeatureEntry!");
+    }
+    if (rel.endsWith("#view")) {
+      return;
+    }
+    super.handleExtraLinkInEntry(rel, type, href, entry);
+  }
+
+  /**
+   * Parses the current entry in the XML document. Assumes that the parser is
+   * currently pointing just after an <entry>.
+   * 
+   * @param plainEntry The entry that will be filled.
+   * @throws XmlPullParserException Thrown if the XML cannot be parsed.
+   * @throws IOException Thrown if the underlying inputstream cannot be read.
+   */
+  @Override
+  protected void handleEntry(Entry plainEntry)
+      throws XmlPullParserException, IOException, ParseException {
+    XmlPullParser parser = getParser();
+    if (!(plainEntry instanceof MapFeatureEntry)) {
+      throw new IllegalArgumentException("Expected MapFeatureEntry!");
+    }
+    MapFeatureEntry entry = (MapFeatureEntry) plainEntry;
+
+    int eventType = parser.getEventType();
+    entry.setPrivacy("public");
+    while (eventType != XmlPullParser.END_DOCUMENT) {
+      switch (eventType) {
+        case XmlPullParser.START_TAG:
+          String name = parser.getName();
+          if ("entry".equals(name)) {
+            // stop parsing here.
+            return;
+          } else if ("id".equals(name)) {
+            entry.setId(XmlUtils.extractChildText(parser));
+          } else if ("title".equals(name)) {
+            entry.setTitle(XmlUtils.extractChildText(parser));
+          } else if ("link".equals(name)) {
+            String rel = parser.getAttributeValue(null /* ns */, "rel");
+            String type = parser.getAttributeValue(null /* ns */, "type");
+            String href = parser.getAttributeValue(null /* ns */, "href");
+            if ("edit".equals(rel)) {
+              entry.setEditUri(href);
+            } else if ("alternate".equals(rel) && "text/html".equals(type)) {
+              entry.setHtmlUri(href);
+            } else {
+              handleExtraLinkInEntry(rel, type, href, entry);
+            }
+          } else if ("summary".equals(name)) {
+            entry.setSummary(XmlUtils.extractChildText(parser));
+          } else if ("content".equals(name)) {
+            StringBuilder contentBuilder = new StringBuilder();
+            int parentDepth = parser.getDepth();
+            while (parser.getEventType() != XmlPullParser.END_DOCUMENT) {
+              int etype = parser.next();
+              switch (etype) {
+                case XmlPullParser.START_TAG:
+                  contentBuilder.append('<');
+                  contentBuilder.append(parser.getName());
+                  contentBuilder.append('>');
+                  break;
+                case XmlPullParser.TEXT:
+                  contentBuilder.append("<![CDATA[");
+                  contentBuilder.append(parser.getText());
+                  contentBuilder.append("]]>");
+                  break;
+                case XmlPullParser.END_TAG:
+                  if (parser.getDepth() > parentDepth) {
+                    contentBuilder.append("</");
+                    contentBuilder.append(parser.getName());
+                    contentBuilder.append('>');
+                  }
+                  break;
+              }
+              if (etype == XmlPullParser.END_TAG
+                  && parser.getDepth() == parentDepth) {
+                break;
+              }
+            }
+            entry.setContent(contentBuilder.toString());
+          } else if ("category".equals(name)) {
+            String category = parser.getAttributeValue(null /* ns */, "term");
+            if (category != null && category.length() > 0) {
+              entry.setCategory(category);
+            }
+            String categoryScheme =
+                parser.getAttributeValue(null /* ns */, "scheme");
+            if (categoryScheme != null && category.length() > 0) {
+              entry.setCategoryScheme(categoryScheme);
+            }
+          } else if ("published".equals(name)) {
+            entry.setPublicationDate(XmlUtils.extractChildText(parser));
+          } else if ("updated".equals(name)) {
+            entry.setUpdateDate(XmlUtils.extractChildText(parser));
+          } else if ("deleted".equals(name)) {
+            entry.setDeleted(true);
+          } else if ("draft".equals(name)) {
+            String draft = XmlUtils.extractChildText(parser);
+            entry.setPrivacy("yes".equals(draft) ? "unlisted" : "public");
+          } else if ("customProperty".equals(name)) {
+            String attrName = parser.getAttributeValue(null, "name");
+            String attrValue = XmlUtils.extractChildText(parser);
+            entry.setAttribute(attrName, attrValue);
+          } else if ("deleted".equals(name)) {
+            entry.setDeleted(true);
+          } else {
+            handleExtraElementInEntry(entry);
+          }
+          break;
+        default:
+          break;
+      }
+
+      eventType = parser.next();
+    }
+  }
+}