Merging to head.

MyTracks/src/com/google/android/apps/mytracks/DialogManager.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
@@ -15,20 +15,20 @@
  */
 package com.google.android.apps.mytracks;
 
+import com.google.android.apps.mytracks.io.sendtogoogle.SendDialog;
 import com.google.android.maps.mytracks.R;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;
 import android.view.WindowManager.BadTokenException;
 
 /**
  * A class to handle all dialog related events for My Tracks.
- * 
+ *
  * @author Sandor Dornbush
  */
 public class DialogManager {
@@ -37,14 +37,12 @@ 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_SEND_TO_GOOGLE_RESULT = 5;
-  public static final int DIALOG_WRITE_PROGRESS = 6;
+  public static final int DIALOG_WRITE_PROGRESS = 5;
 
   private ProgressDialog progressDialog;
   private ProgressDialog importProgressDialog;
   private ProgressDialog writeProgressDialog;
-  private SendToGoogleDialog sendToGoogleDialog;
-  private AlertDialog sendToGoogleResultDialog;
+  private SendDialog sendToGoogleDialog;
   private ChartSettingsDialog chartSettingsDialog;
 
   private MyTracks activity;
@@ -52,7 +50,7 @@ public class DialogManager {
   public DialogManager(MyTracks activity) {
     this.activity = activity;
   }
-  
+
   protected Dialog onCreateDialog(int id, Bundle args) {
     switch (id) {
       case DIALOG_CHART_SETTINGS:
@@ -77,26 +75,8 @@ public class DialogManager {
         progressDialog.setProgress(10);
         return progressDialog;
       case DIALOG_SEND_TO_GOOGLE:
-        sendToGoogleDialog = new SendToGoogleDialog(activity);
+        sendToGoogleDialog = new SendDialog(activity);
         return sendToGoogleDialog;
-      case DIALOG_SEND_TO_GOOGLE_RESULT:
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        builder.setIcon(android.R.drawable.ic_dialog_info);
-        builder.setTitle("Title");
-        builder.setMessage("Message");
-        builder.setPositiveButton(activity.getString(R.string.ok), null);
-        builder.setNeutralButton(activity.getString(R.string.share_track),
-            new DialogInterface.OnClickListener() {
-              public void onClick(DialogInterface dialog, int which) {
-                SendToGoogleDialog sendToGoogleDialog = getSendToGoogleDialog();
-                final boolean sentToMyMaps = sendToGoogleDialog.getSendToMyMaps();
-                final boolean sentToFusionTables = sendToGoogleDialog.getSendToFusionTables();
-                activity.shareLinkToMap(sentToMyMaps, sentToFusionTables);
-                dialog.dismiss();
-              }
-            });
-        sendToGoogleResultDialog = builder.create();
-        return sendToGoogleResultDialog;
       case DIALOG_WRITE_PROGRESS:
         writeProgressDialog = new ProgressDialog(activity);
         writeProgressDialog.setIcon(android.R.drawable.ic_dialog_info);
@@ -115,24 +95,6 @@ public class DialogManager {
       case DIALOG_SEND_TO_GOOGLE:
         activity.resetSendToGoogleStatus();
         break;
-      case DIALOG_SEND_TO_GOOGLE_RESULT:
-        boolean success = activity.getSendToGoogleSuccess();
-        sendToGoogleResultDialog.setTitle(
-            success ? R.string.success : R.string.error);
-        sendToGoogleResultDialog.setIcon(success
-            ? android.R.drawable.ic_dialog_info
-            : android.R.drawable.ic_dialog_alert);
-        sendToGoogleResultDialog.setMessage(activity.getSendToGoogleResultMessage());
-
-        boolean canShare =
-            activity.getSendToFusionTablesTableId() != null &&
-            activity.getSendToMyMapsMapId() != null;
-        View share =
-            sendToGoogleResultDialog.findViewById(android.R.id.button3);
-        if (share != null) {
-          share.setVisibility(canShare ? View.VISIBLE : View.GONE);
-        }
-        break;
       case DIALOG_CHART_SETTINGS:
         Log.d(MyTracksConstants.TAG, "MyTracks.onPrepare chart dialog");
         chartSettingsDialog.setup(activity.getChartActivity());
@@ -151,7 +113,7 @@ public class DialogManager {
       }
     });
   }
-  
+
   public void setProgressValue(final int percent) {
     activity.runOnUiThread(new Runnable() {
       public void run() {
@@ -167,7 +129,7 @@ public class DialogManager {
   /**
    * @return the sendToGoogleDialog
    */
-  public SendToGoogleDialog getSendToGoogleDialog() {
+  public SendDialog getSendToGoogleDialog() {
     return sendToGoogleDialog;
   }
 
@@ -196,9 +158,9 @@ public class DialogManager {
   }
 
   /**
-   * Just like showDialog, but will catch a BadTokenException that sometimes
-   * (very rarely) gets thrown. This might happen if the user hits the "back"
-   * button immediately after sending tracks to google.
+   * Just like showDialog, but will catch a {@link BadTokenException} that
+   * sometimes (very rarely) gets thrown. This might happen if the user hits
+   * the "back" button immediately after sending tracks to google.
    *
    * @param id the dialog id
    */
@@ -218,6 +180,24 @@ public class DialogManager {
     });
   }
 
+  /**
+   * The equivalent of {@link #showDialogSafely(int)}, but for a specific
+   * dialog instance.
+   */
+  public static void showDialogSafely(Activity activity, final Dialog dialog) {
+    activity.runOnUiThread(new Runnable() {
+      public void run() {
+        try {
+          dialog.show();
+        } catch (BadTokenException e) {
+          Log.w(MyTracksConstants.TAG, "Could not display dialog", e);
+        } catch (IllegalStateException e) {
+          Log.w(MyTracksConstants.TAG, "Could not display dialog", e);
+        }
+      }
+    });
+  }
+
   /**
    * Dismisses the progress dialog if it is showing. Executed on the UI thread.
    */

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

@@ -36,6 +36,10 @@ 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.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;
@@ -77,7 +81,9 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -139,9 +145,9 @@ public class MyTracks extends TabActivity implements OnTouchListener,
 
   private ITrackRecordingService trackRecordingService;
 
-  /**		
-   * Does the user want to share the current track.		
-   */		
+  /**
+   * Does the user want to share the current track.
+   */
   private boolean shareRequested = false;
 
   /**
@@ -909,11 +915,11 @@ 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() {
-    SendToGoogleDialog sendToGoogleDialog =
+    SendDialog sendToGoogleDialog =
         dialogManager.getSendToGoogleDialog();
     if (sendToGoogleDialog == null) {
       return;
@@ -934,7 +940,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     }
   }
 
-  private void sendToGoogleMapsOrPickMap(SendToGoogleDialog sendToGoogleDialog) {
+  private void sendToGoogleMapsOrPickMap(SendDialog sendToGoogleDialog) {
     if (!sendToGoogleDialog.getCreateNewMap()) {
       // Ask the user to choose a map to upload into
       Intent listIntent = new Intent(this, MyMapsList.class);
@@ -989,7 +995,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   }
 
   private void onSendToGoogleMapsDone() {
-    SendToGoogleDialog sendToGoogleDialog = dialogManager.getSendToGoogleDialog();
+    SendDialog sendToGoogleDialog = dialogManager.getSendToGoogleDialog();
     if (sendToGoogleDialog.getSendToFusionTables()) {
       authenticateToFusionTables(null);
     } else if (sendToGoogleDialog.getSendToDocs()) {
@@ -1029,7 +1035,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
             Log.w(MyTracksConstants.TAG, "Updating table id failed.", e);
           }
         }
-        
+
         onSendToFusionTablesDone();
       }
     };
@@ -1044,7 +1050,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   }
 
   private void onSendToFusionTablesDone() {
-    SendToGoogleDialog sendToGoogleDialog = dialogManager.getSendToGoogleDialog();
+    SendDialog sendToGoogleDialog = dialogManager.getSendToGoogleDialog();
     if (sendToGoogleDialog.getSendToDocs()) {
       authenticateToGoogleDocs();
     } else {
@@ -1076,7 +1082,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     Log.d(MyTracksConstants.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;
@@ -1099,30 +1105,53 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   }
 
   private void onSendToGoogleDone() {
-    SendToGoogleDialog sendToGoogleDialog = dialogManager.getSendToGoogleDialog();
+    SendDialog sendToGoogleDialog = dialogManager.getSendToGoogleDialog();
     final boolean sentToMyMaps = sendToGoogleDialog.getSendToMyMaps();
     final boolean sentToFusionTables = sendToGoogleDialog.getSendToFusionTables();
-
     dialogManager.dismissDialogSafely(DIALOG_PROGRESS);
-    runOnUiThread(new Runnable() {
-      public void run() {
-        if (shareRequested) {
-          Toast.makeText(MyTracks.this, getSendToGoogleResultMessage(), Toast.LENGTH_LONG)
-              .show();
 
-          if (shareLinkToMap(sentToMyMaps, sentToFusionTables)) {
-            return;
-          }
+    // We've finished sending the track to the user-selected services.  Now
+    // we tell them the results of the upload, and optionally share the track.
+    // There are a few different paths through this code:
+    //
+    // 1. The user pre-requested a share (shareRequested == true).  We're going
+    //    to display the result dialog *without* the share button (the share
+    //    listener will be null).  The OK button listener will initiate the
+    //    share.
+    //
+    // 2. The user did not pre-request a share, and the set of services to
+    //    which we succeeded in uploading the track are compatible with
+    //    sharing.  We'll display a share button (the share listener will be
+    //    non-null), and will share the link if the user clicks it.
+    //
+    // 3. The user did not pre-request a share, and the set of services to
+    //    which we succeeded in uploading the track are incompatible with
+    //    sharing.  We won't display a share button.
+
+    final boolean canShare = getSendToFusionTablesTableId() != null
+        || getSendToMyMapsMapId() != null;
+
+    DialogInterface.OnClickListener doShareListener = null;
+    if (canShare) {
+      doShareListener = new DialogInterface.OnClickListener() {
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+          shareLinkToMap(sentToMyMaps, sentToFusionTables);
         }
+      };
+    }
 
-        // If anything failed or sharing was not requested, show the dialog
-        dialogManager.showDialogSafely(
-            DialogManager.DIALOG_SEND_TO_GOOGLE_RESULT);
-      }
-    });
+    DialogInterface.OnClickListener onOkListener = (canShare && shareRequested)
+        ? doShareListener : null;
+    DialogInterface.OnClickListener onShareListener = (canShare && !shareRequested)
+        ? doShareListener : null;
+
+    AlertDialog sendToGoogleResultDialog = ResultDialogFactory.makeDialog(this,
+        makeSendToGoogleResults(sendToGoogleDialog), onOkListener, onShareListener);
+    DialogManager.showDialogSafely(this, sendToGoogleResultDialog);
   }
 
-  boolean shareLinkToMap(boolean sentToMyMaps, boolean sentToFusionTables) {
+  private boolean shareLinkToMap(boolean sentToMyMaps, boolean sentToFusionTables) {
     String url = null;
     if (sentToMyMaps && sendToMyMapsSuccess) {
       // Prefer a link to My Maps
@@ -1145,27 +1174,24 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     return SendToFusionTables.getMapVisualizationUrl(track);
   }
 
-  String getSendToGoogleResultMessage() {
-    StringBuilder message = new StringBuilder();
-    SendToGoogleDialog sendToGoogleDialog =
-      dialogManager.getSendToGoogleDialog();
-    if (sendToGoogleDialog.getSendToMyMaps()) {
-      message.append(sendToMyMapsMessage);
+  /**
+   * Creates a list of {@link SendResult} instances based on the set of
+   * services selected in {@link SendDialog} and the results as known to
+   * this class.
+   */
+  private List<SendResult> makeSendToGoogleResults(SendDialog dialog) {
+    List<SendResult> results = new ArrayList<SendResult>();
+    if (dialog.getSendToMyMaps()) {
+      results.add(new SendResult(SendType.MYMAPS, sendToMyMapsSuccess));
     }
-    if (sendToGoogleDialog.getSendToFusionTables()) {
-      message.append(sendToFusionTablesMessage);
+    if (dialog.getSendToFusionTables()) {
+      results.add(new SendResult(SendType.FUSION_TABLES, sendToFusionTablesSuccess));
     }
-    if (sendToGoogleDialog.getSendToDocs()) {
-      if (message.length() > 0) {
-        message.append(' ');
-      }
-      message.append(sendToDocsMessage);
+    if (dialog.getSendToDocs()) {
+      results.add(new SendResult(SendType.DOCS, sendToDocsSuccess));
     }
-    if (sendToMyMapsSuccess && sendToFusionTablesSuccess && sendToDocsSuccess) {
-      message.append(' ');
-      message.append(getString(R.string.status_mymap_info));
-    }
-    return message.toString();
+
+    return results;
   }
 
   void clearSelectedTrack() {
@@ -1293,7 +1319,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   }
 
   public boolean getSendToGoogleSuccess() {
-    return sendToFusionTablesSuccess && sendToDocsSuccess;
+    return sendToMyMapsSuccess && sendToFusionTablesSuccess && sendToDocsSuccess;
   }
 
   // @VisibleForTesting
@@ -1305,12 +1331,12 @@ public class MyTracks extends TabActivity implements OnTouchListener,
   SharedPreferences getSharedPreferences() {
     return sharedPreferences;
   }
-  
+
   // @VisibleForTesting
   static void clearInstance() {
     instance = null;
   }
-  
+
   // @VisibleForTesting
   ITrackRecordingService getTrackRecordingService() {
     return trackRecordingService;

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

@@ -232,10 +232,14 @@ public class MyTracksSettings extends PreferenceActivity {
 
     // Update the ANT+ sensors.
     // TODO: Only enable on phones that have ANT+.
-    findPreference(getString(R.string.ant_heart_rate_sensor_id_key))
-        .setEnabled(getString(R.string.ant_sensor_type).equals(sensorType));
-    findPreference(getString(R.string.ant_srm_bridge_sensor_id_key))
-        .setEnabled(getString(R.string.srm_ant_bridge_sensor_type).equals(sensorType));
+    Preference antHrm = findPreference(getString(R.string.ant_heart_rate_sensor_id_key));
+    Preference antSrm = findPreference(getString(R.string.ant_srm_bridge_sensor_id_key));
+    if (antHrm != null && antSrm != null) {
+      antHrm
+          .setEnabled(getString(R.string.ant_sensor_type).equals(sensorType));
+      antSrm
+          .setEnabled(getString(R.string.srm_ant_bridge_sensor_type).equals(sensorType));
+    }
   }
 
   /**

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

@@ -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 = true;
+    boolean success = false;
     try {
       progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
       progressIndicator.setProgressMessage(R.string.progress_message_reading_track);
@@ -204,10 +204,11 @@ public class SendToFusionTables implements Runnable {
       }
 
       statusMessageId = R.string.status_new_fusiontable_has_been_created;
+      success = true;
       Log.d(MyTracksConstants.TAG, "SendToFusionTables: Done: " + success);
       progressIndicator.setProgressValue(PROGRESS_COMPLETE);
-    } finally {
 
+    } finally {
       final boolean finalSuccess = success;
       final int finalStatusMessageId = statusMessageId;
       context.runOnUiThread(new Runnable() {

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

@@ -0,0 +1,106 @@
+/*
+ * 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.sendtogoogle;
+
+import com.google.android.maps.mytracks.R;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.view.View;
+import android.widget.ListView;
+
+import java.util.List;
+
+/**
+ * Creates the dialog used to display the results of sending track data to
+ * Google.  The dialog lists the services to which data was uploaded, along
+ * with an indicator of success/failure.  If possible, a button is displayed
+ * offering to share the uploaded track.
+ *
+ * Implementation note: This class is a factory, rather than a {@link Dialog}
+ * subclass, because alert dialogs have to be created with
+ * {@link AlertDialog.Builder}.  Attempts to subclass {@link AlertDialog}
+ * directly have been unsuccessful, as {@link AlertDialog.Builder} uses a
+ * private subclass to implement most of the interesting behavior.
+ *
+ * @author Matthew Simmons
+ */
+public class ResultDialogFactory {
+  private ResultDialogFactory() {}
+
+  /**
+   * Create a send-to-Google result dialog.  The caller is responsible for
+   * showing it.
+   *
+   * @param activity the activity associated with the dialog
+   * @param results the results to be displayed in the dialog
+   * @param onOkClickListener the listener to invoke if the OK button is
+   *     clicked
+   * @param onShareClickListener the listener to invoke if the Share button is
+   *     clicked.  If no share listener is provided, the Share button will not
+   *     be displayed.
+   * @return the created dialog
+   */
+  public static AlertDialog makeDialog(Activity activity, List<SendResult> results,
+      DialogInterface.OnClickListener onOkClickListener,
+      DialogInterface.OnClickListener onShareClickListener) {
+    boolean success = true;
+    for (SendResult result : results) {
+      if (!result.isSuccess()) {
+        success = false;
+        break;
+      }
+    }
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+        .setView(makeDialogContent(activity, results, success));
+
+    if (success) {
+      builder.setTitle(R.string.success);
+      builder.setIcon(android.R.drawable.ic_dialog_info);
+    } else {
+      builder.setTitle(R.string.error);
+      builder.setIcon(android.R.drawable.ic_dialog_alert);
+    }
+
+    builder.setPositiveButton(activity.getString(R.string.ok), onOkClickListener);
+    if (onShareClickListener != null) {
+      builder.setNeutralButton(activity.getString(R.string.share_track),
+          onShareClickListener);
+    }
+
+    return builder.create();
+  }
+
+  private static View makeDialogContent(Activity activity, List<SendResult> results,
+      boolean success) {
+    ResultListAdapter resultListAdapter = new ResultListAdapter(activity,
+        R.layout.send_to_google_result_list_item, results);
+
+    View content = activity.getLayoutInflater().inflate(R.layout.send_to_google_result, null);
+    ListView resultList = (ListView) content.findViewById(R.id.send_to_google_result_list);
+    resultList.setAdapter(resultListAdapter);
+
+    content.findViewById(R.id.send_to_google_result_comment)
+        .setVisibility(success ? View.VISIBLE : View.GONE);
+    content.findViewById(R.id.send_to_google_result_error)
+        .setVisibility(success ? View.GONE : View.VISIBLE);
+
+    return content;
+  }
+}

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

@@ -0,0 +1,85 @@
+/*
+ * 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.sendtogoogle;
+
+import com.google.android.maps.mytracks.R;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.TextView;
+
+import java.util.List;
+
+/**
+ * This class implements the {@link ListAdapter} used by the send-to-Google
+ * result dialog created by {@link ResultDialogFactory}.  It generates views
+ * for each entry in an array of {@link SendResult} instances.
+ * @author Matthew Simmons
+ */
+class ResultListAdapter extends ArrayAdapter<SendResult> {
+  public ResultListAdapter(Context context, int textViewResourceId, List<SendResult> results) {
+    super(context, textViewResourceId, results);
+  }
+
+  @Override
+  public View getView(int position, View convertView, ViewGroup parent) {
+    View view = convertView;
+    if (view == null) {
+      LayoutInflater inflater
+          = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+      view = inflater.inflate(R.layout.send_to_google_result_list_item, null);
+    }
+
+    SendResult result = getItem(position);
+    setImage(view, result.isSuccess() ? R.drawable.success : R.drawable.failure);
+    setName(view, result.getType().getServiceName());
+    setUrl(view, result.getType().getServiceUrl());
+    return view;
+  }
+
+  @Override
+  public boolean areAllItemsEnabled() {
+    // We don't want the displayed items to be clickable
+    return false;
+  }
+
+  // The following protected methods exist to be overridden for testing
+  // purposes.  Doing so insulates the test class from the details of the
+  // layout.
+
+  protected void setImage(View content, int drawableId) {
+    ImageView imageView = (ImageView) content.findViewById(R.id.send_to_google_result_icon);
+    imageView.setImageDrawable(getContext().getResources().getDrawable(drawableId));
+  }
+
+  protected void setName(View content, int nameId) {
+    setTextViewText(content, R.id.send_to_google_result_name, nameId);
+  }
+
+  protected void setUrl(View content, int urlId) {
+    setTextViewText(content, R.id.send_to_google_result_url, urlId);
+  }
+
+  private void setTextViewText(View content, int viewId, int textId) {
+    TextView textView = (TextView) content.findViewById(viewId);
+    textView.setText(getContext().getString(textId));
+  }
+};

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

@@ -1,20 +1,23 @@
 /*
  * 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;
+package com.google.android.apps.mytracks.io.sendtogoogle;
 
+import com.google.android.apps.mytracks.DialogManager;
+import com.google.android.apps.mytracks.MyTracks;
+import com.google.android.apps.mytracks.MyTracksSettings;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Dialog;
@@ -37,7 +40,7 @@ import android.widget.RadioGroup;
  *
  * @author Leif Hendrik Wilden
  */
-public class SendToGoogleDialog extends Dialog {
+public class SendDialog extends Dialog {
 
   private RadioGroup groupMyMaps;
   private RadioButton createNewMapRadioButton;
@@ -49,7 +52,7 @@ public class SendToGoogleDialog extends Dialog {
   private RadioButton sendStatsAndPointsRadioButton;
   private Button sendButton;
 
-  public SendToGoogleDialog(Context context) {
+  public SendDialog(Context context) {
     super(context);
   }
 
@@ -81,8 +84,6 @@ public class SendToGoogleDialog extends Dialog {
             sendToFusionTablesCheckBox.isChecked() ||
             sendToDocsCheckBox.isChecked());
         groupMyMaps.setVisibility(sendToMyMapsCheckBox.isChecked() ? View.VISIBLE : View.INVISIBLE);
-        //groupDocs.setVisibility(
-        //    sendToDocsCheckBox.isChecked() ? View.VISIBLE : View.INVISIBLE);
       }
     };
 

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

@@ -0,0 +1,46 @@
+/*
+ * 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.sendtogoogle;
+
+/**
+ * This class represents the the result of the uploading of track data to a
+ * single service.
+ *
+ * @author Matthew Simmons
+ */
+public class SendResult {
+  private final SendType type;
+  private final boolean success;
+
+  /**
+   * @param type the service to which track data was uploaded
+   * @param success true if the uploading succeeded
+   */
+  public SendResult(SendType type, boolean success) {
+    this.type = type;
+    this.success = success;
+  }
+
+  /** Returns the service to which the track data was uploaded */
+  public SendType getType() {
+    return type;
+  }
+
+  /** Returns true if the uploading succeeded */
+  public boolean isSuccess() {
+    return success;
+  }
+}

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

@@ -0,0 +1,50 @@
+/*
+ * 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.sendtogoogle;
+
+import com.google.android.maps.mytracks.R;
+
+/**
+ * Enumerates the services to which we can upload track data.
+ *
+ * @author Matthew Simmons
+ */
+public enum SendType {
+  MYMAPS(R.string.sendtogoogle_google_mymaps,
+      R.string.sendtogoogle_google_mymaps_url),
+  FUSION_TABLES(R.string.sendtogoogle_google_fusiontables,
+      R.string.sendtogoogle_google_fusiontables_url),
+  DOCS(R.string.sendtogoogle_google_docs,
+      R.string.sendtogoogle_google_docs_url);
+
+  private int serviceName;
+  private int serviceUrl;
+
+  private SendType(int serviceName, int serviceUrl) {
+    this.serviceName = serviceName;
+    this.serviceUrl = serviceUrl;
+  }
+
+  /** Returns the resource ID for the printable (short) name of the service */
+  public int getServiceName() {
+    return serviceName;
+  }
+
+  /** Returns the resource ID for the service's URL */
+  public int getServiceUrl() {
+    return serviceUrl;
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/services/StatusAnnouncerTask.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
@@ -128,6 +128,25 @@ public class StatusAnnouncerTask implements PeriodicTask {
    */
   @Override
   public void run(TrackRecordingService service) {
+    if (service == null) {
+      Log.e(MyTracksConstants.TAG, "StatusAnnouncer TrackRecordingService not initialized");
+      return;
+    }
+
+    runWithStatistics(service.getTripStatistics());
+  }
+
+  /**
+   * This method exists as a convenience for testing code, allowing said code
+   * to avoid needing to instantiate an entire {@link TrackRecordingService}
+   * just to test the announcer.
+   */
+  protected void runWithStatistics(TripStatistics statistics) {
+    if (statistics == null) {
+      Log.e(MyTracksConstants.TAG, "StatusAnnouncer stats not initialized.");
+      return;
+    }
+
     if (!ready || tts == null) {
       Log.e(MyTracksConstants.TAG, "StatusAnnouncer Tts not ready.");
       return;
@@ -139,12 +158,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
       return;
     }
 
-    if (service == null || service.getTripStatistics() == null) {
-      Log.e(MyTracksConstants.TAG, "StatusAnnouncer stats not initialized.");
-      return;
-    }
-
-    String announcement = getAnnouncement(service.getTripStatistics());
+    String announcement = getAnnouncement(statistics);
     Log.d(MyTracksConstants.TAG, "Announcement: " + announcement);
     speakAnnouncment(announcement);
   }
@@ -165,7 +179,7 @@ public class StatusAnnouncerTask implements PeriodicTask {
     boolean metricUnits = true;
     boolean reportSpeed = true;
     if (preferences != null) {
-      metricUnits = 
+      metricUnits =
           preferences.getBoolean(context.getString(R.string.metric_units_key),
               true);
       reportSpeed =

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

@@ -902,7 +902,7 @@ public class TrackRecordingService extends Service implements LocationListener {
       // Make it an impossible location.
       Location l = new Location("");
       l.setLatitude(100);
-      l.setLongitude(200);
+      l.setLongitude(180);
       wpt.setLocation(l);
     } else {
       // A null location is ok, and expected on track start.