Integrate most of Rodrigo's comments.

MyTracks/res/values/keys.xml

@@ -0,0 +1,42 @@
+<?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>
+  <!-- These are constants used internally for preferences - DO NOT TRANSLATE -->
+  <string name="announcement_frequency_key">announcementFrequency</string>
+  <string name="bluetooth_device_key">bluetoothDevice</string>
+  <string name="bluetooth_pairing_key">bluetoothPairing</string>
+  <string name="bluetooth_sensor_key">bluetoothSensor</string>
+  <string name="default_map_public_key">defaultMapPublic</string>
+  <string name="max_recording_distance_key">maxRecordingDistance</string>
+  <string name="metric_units_key">metricUnits</string>
+  <string name="min_recording_distance_key">minRecordingDistance</string>
+  <string name="min_recording_interval_key">minRecordingInterval</string>
+  <string name="min_required_accuracy_key">minRequiredAccuracy</string>
+  <string name="modular_stats_display_key">modularStatsDisplay</string>
+  <string name="pick_existing_map_key">pickExistingMap</string>
+  <string name="recording_track_key">recordingTrack</string>
+  <string name="report_speed_key">reportSpeed</string>
+  <string name="selected_track_key">selectedTrack</string>
+  <string name="send_stats_and_points_key">sendStatsAndPoints</string>
+  <string name="send_to_docs_key">sendToDocs</string>
+  <string name="send_to_my_maps_key">sendToMyMaps</string>
+  <string name="sensor_id_key">sensorId</string>
+  <string name="sensor_type_key">sensorType</string>
+  <string name="share_url_only_key">shareUrlOnly</string>
+  <string name="signal_sampling_frequency_key">signalSamplingFrequency</string>
+  <string name="split_frequency_key">splitFrequency</string>
+</resources>

MyTracks/res/values/strings.xml

@@ -167,10 +167,6 @@ limitations under the License.
   <string name="settings_recording">Recording</string>
   <string name="settings_sharing">Sharing</string>
 
-  <string name="settings_black_box_mode">Black box mode</string>
-  <string name="settings_black_box_mode_summary_on">Recording will be started and stopped automatically</string>
-  <string name="settings_black_box_mode_summary_off">Recording must be initiated by the user</string>
-
   <string name="settings_announcement_frequency">Announcement frequency</string>
   <string name="settings_announcement_frequency_summary">Minimum time between two voice announcements</string>
   <string name="settings_announcement_not_available_summary">Text-to-speech announcements are not available in your version of Android</string>
@@ -354,7 +350,6 @@ limitations under the License.
   <string name="max_heart_rate">Max Heart Rate</string>
   <string name="unknown">-</string>
   <string name="waiting">Waiting...</string>
-  <string name="mode">Mode</string>
 
   <!-- End User License Agreement -->
   <string name="eula_title">End User License Agreement</string>
@@ -436,31 +431,6 @@ limitations under the License.
   <string name="cdma_strength">CDMA Strength: %1$d dBm</string>
   <string name="evdo_strength">EVDO Strength: %1$d dBm</string>
 
-  <!-- These are constants used internally for preferences - DO NOT TRANSLATE -->
-  <string name="announcement_frequency_key">announcementFrequency</string>
-  <string name="bluetooth_device_key">bluetoothDevice</string>
-  <string name="bluetooth_pairing_key">bluetoothPairing</string>
-  <string name="bluetooth_sensor_key">bluetoothSensor</string>
-  <string name="default_map_public_key">defaultMapPublic</string>
-  <string name="max_recording_distance_key">maxRecordingDistance</string>
-  <string name="metric_units_key">metricUnits</string>
-  <string name="min_recording_distance_key">minRecordingDistance</string>
-  <string name="min_recording_interval_key">minRecordingInterval</string>
-  <string name="min_required_accuracy_key">minRequiredAccuracy</string>
-  <string name="modular_stats_display_key">modularStatsDisplay</string>
-  <string name="pick_existing_map_key">pickExistingMap</string>
-  <string name="recording_track_key">recordingTrack</string>
-  <string name="report_speed_key">reportSpeed</string>
-  <string name="selected_track_key">selectedTrack</string>
-  <string name="send_stats_and_points_key">sendStatsAndPoints</string>
-  <string name="send_to_docs_key">sendToDocs</string>
-  <string name="send_to_my_maps_key">sendToMyMaps</string>
-  <string name="sensor_id_key">sensorId</string>
-  <string name="sensor_type_key">sensorType</string>
-  <string name="share_url_only_key">shareUrlOnly</string>
-  <string name="signal_sampling_frequency_key">signalSamplingFrequency</string>
-  <string name="split_frequency_key">splitFrequency</string>
-
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
   <string name="bluetooth_options">Bluetooth options</string>
@@ -484,16 +454,5 @@ limitations under the License.
   <string name="sensor_data_time">Sensor Data Time</string>
   <string name="power_meter_enabled">Power meter enabled</string>
   <string name="heart_rate_monitor_enabled">Heart rate monitor enabled</string>
-  <string name="last_upload_latency">Last Upload Latency</string>
-  <string name="last_n_uploads_latency">Last N Uploads Latency</string>
-
-  <!-- Realtime data uploads -->
-  <string name="realtime_upload_failed">Realtime upload failed.</string>
-  <string name="realtime_uploader_status">Realtime upload status</string>
-  <string name="key_loading_failed">Failed to load encryption keys.</string>
-  <string name="uploader_id">Uploader ID</string>
-  <string name="uploader_id_summary">Your ID to upload data with</string>
-  <string name="upload_url">Upload URL</string>
-  <string name="upload_url_summary">URL to upload realtime data to</string>
 
 </resources>

MyTracks/src/com/google/android/apps/mymaps/VersionChecker.java

@@ -87,10 +87,12 @@ public class VersionChecker {
     try {
       PackageInfo pi =
           parentActivity.getPackageManager().getPackageInfo(
-              "com.google.android.maps.mytracks", PackageManager.GET_META_DATA);
+              "com.google.android.maps.mytracks",
+              PackageManager.GET_META_DATA);
       currentVersion = pi.versionName;
     } catch (NameNotFoundException e) {
       Log.w(MyTracksConstants.TAG, "Failed to get version info.", e);
+      return;
     }
 
     GDataParser parser = client.getParserForFeed(

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

@@ -109,7 +109,8 @@ public class ExportAllTracks {
         context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
     long recordingTrackId = -1;
     if (prefs != null) {
-      recordingTrackId = prefs.getLong(context.getString(R.string.recording_track_key), -1);
+      recordingTrackId =
+    	  prefs.getLong(context.getString(R.string.recording_track_key), -1);
     }
     if (recordingTrackId != -1) {
       acquireWakeLock();

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

@@ -26,7 +26,7 @@ import android.view.MenuItem;
  * 
  * @author Sandor Dornbush
  */
-public class MenuManager {
+class MenuManager {
 
   private MyTracks activity;
 

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

@@ -64,7 +64,6 @@ public abstract class MyTracksConstants {
   public static final int SHOW_WAYPOINT = 25;
   public static final int EDIT_WAYPOINT = 26;
   public static final int WELCOME = 27;
-  public static final int REQUEST_ENABLE_BT = 28;
 
   /*
    * Menu ids:

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

@@ -215,30 +215,26 @@ public class MyTracksMap extends MapActivity
         while (lastSeenLocationId < selectedTrack.getStopId()) {
           cursor = providerUtils.getLocationsCursor(
               selectedTrack.getId(), lastSeenLocationId, bufferSize, false);
-          if (cursor != null) {
+          if (cursor != null && cursor.moveToFirst()) {
-            if (cursor.moveToFirst()) {
+	          final int idColumnIdx =
-              final int idColumnIdx =
+	              cursor.getColumnIndexOrThrow(TrackPointsColumns._ID);
-                  cursor.getColumnIndexOrThrow(TrackPointsColumns._ID);
+	          while (cursor.moveToNext()) {
-              while (cursor.moveToNext()) {
+	            points++;
-                points++;
+	            Location location = providerUtils.createLocation(cursor);
-                Location location = providerUtils.createLocation(cursor);
+	            if (MyTracksUtils.isValidLocation(location)) {
-                if (MyTracksUtils.isValidLocation(location)) {
+	              lastSeenLocationId = cursor.getLong(idColumnIdx);
-                  lastSeenLocationId = cursor.getLong(idColumnIdx);
+	              // Include a point if it fits one of the following criteria:
-                  // Include a point if it fits one of the following criteria:
+	              // - Has the mod for the sampling frequency.
-                  // - Has the mod for the sampling frequency.
+	              // - Is the first point.
-                  // - Is the first point.
+	              // - Is the last point and we are not recording this track.
-                  // - Is the last point and we are not recording this track.
+	              if (points % samplingFrequency == 0 ||
-                  if (points % samplingFrequency == 0 ||
+	                  points == 0 ||
-                      points == 0 ||
+	                  (recordingTrackId != selectedTrack.getId() &&
-                      (recordingTrackId != selectedTrack.getId() &&
+	                      points == (totalLocations - 1))) {
-                          points == (totalLocations - 1))) {
+	                mapOverlay.addLocation(location);
-                    mapOverlay.addLocation(location);
+	              }
-                  }
+	            }
-                }
+	          }
-              }
-            } else {
-              lastSeenLocationId += bufferSize;
-            }
           } else {
             lastSeenLocationId += bufferSize;
           }

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

@@ -55,7 +55,7 @@ public class MyTracksOverlay extends Overlay {
   private final Paint errorCirclePaint;
   private final Context context;
   private final ArrayList<Waypoint> waypoints = new ArrayList<Waypoint>();
-  private final ArrayList<Location> points = new ArrayList<Location>();
+  private final ArrayList<Location> points = new ArrayList<Location>(1024);
 
   private Track selectedTrack;
   private int lastHeading = 0;

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

@@ -94,6 +94,9 @@ public class StatsActivity extends Activity
    */
   private boolean showCurrentSegment = false;
 
+  private final MyTracksProviderUtils providerUtils;
+  private Track track = null;
+
   /**
    * A runnable for posting to the UI thread. Will update the total time field.
    */
@@ -131,9 +134,6 @@ public class StatsActivity extends Activity
     }
   }
 
-  private MyTracksProviderUtils providerUtils;
-  private Track track = null;
-
   public StatsActivity() {
     utils = new StatsUtilities(this);
     providerUtils = new MyTracksProviderUtilsImpl(this);