merge heads

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

@@ -132,16 +132,16 @@ public class SaveActivity extends Activity {
     // Share the file.
     Intent shareIntent = new Intent(Intent.ACTION_SEND);
     shareIntent.putExtra(Intent.EXTRA_SUBJECT,
-        getResources().getText(R.string.send_track_subject).toString());
+        getResources().getText(R.string.share_track_subject).toString());
     shareIntent.putExtra(Intent.EXTRA_TEXT,
-        getResources().getText(R.string.send_track_body_format)
+        getResources().getText(R.string.share_track_file_body_format)
         .toString());
     shareIntent.setType(format.getMimeType());
     Uri u = Uri.fromFile(new File(writer.getAbsolutePath()));
     shareIntent.putExtra(Intent.EXTRA_STREAM, u);
     shareIntent.putExtra(getString(R.string.track_id_broadcast_extra), trackId);
     startActivity(Intent.createChooser(shareIntent,
-        getResources().getText(R.string.share_track).toString()));
+        getResources().getText(R.string.share_track_picker_title).toString()));
   }
 
   private void showResultDialog() {

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

@@ -17,6 +17,8 @@ package com.google.android.apps.mytracks.io.file;
 
 import static com.google.android.apps.mytracks.Constants.TAG;
 
+import com.google.android.apps.mytracks.util.FileUtils;
+
 import android.os.Environment;
 import android.util.Log;
 
@@ -51,11 +53,9 @@ public class TempFileCleaner {
   }
 
   private void cleanTmpDirectory(String name) {
-    String sep = System.getProperty("file.separator");
-    cleanTmpDirectory(
-        new File(
-            Environment.getExternalStorageDirectory() + sep + name + sep
-            + "tmp"));
+    FileUtils fileUtils = new FileUtils();
+    String dirName = fileUtils.buildExternalDirectoryPath(name, "tmp");
+    cleanTmpDirectory(new File(dirName));
   }
 
   // @VisibleForTesting

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

@@ -81,7 +81,7 @@ public class ResultDialogFactory {
 
     builder.setPositiveButton(activity.getString(R.string.ok), onOkClickListener);
     if (onShareClickListener != null) {
-      builder.setNegativeButton(activity.getString(R.string.share_track),
+      builder.setNegativeButton(activity.getString(R.string.share_track_url),
           onShareClickListener);
     }
 

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

@@ -692,15 +692,15 @@ public class SendActivity extends Activity implements ProgressIndicator {
     boolean shareUrlOnly = sharedPreferences.getBoolean(
         getString(R.string.share_url_only_key), false);
     String msg = shareUrlOnly ? url : String.format(
-        getResources().getText(R.string.share_map_body_format).toString(), url);
+        getResources().getText(R.string.share_track_url_body_format).toString(), url);
 
     Intent shareIntent = new Intent(Intent.ACTION_SEND);
     shareIntent.setType("text/plain");
     shareIntent.putExtra(Intent.EXTRA_SUBJECT,
-        getResources().getText(R.string.share_map_subject).toString());
+        getResources().getText(R.string.share_track_subject).toString());
     shareIntent.putExtra(Intent.EXTRA_TEXT, msg);
     startActivity(Intent.createChooser(shareIntent,
-        getResources().getText(R.string.share_map).toString()));
+        getResources().getText(R.string.share_track_picker_title).toString()));
   }
 
   protected String getFusionTablesUrl(long trackId) {

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

@@ -45,7 +45,6 @@ public class SendDialog extends Dialog {
   private CheckBox sendToMyMapsCheckBox;
   private CheckBox sendToFusionTablesCheckBox;
   private CheckBox sendToDocsCheckBox;
-  private RadioButton sendStatsAndPointsRadioButton;
   private OnClickListener clickListener;
 
   public SendDialog(Context context) {
@@ -69,9 +68,6 @@ public class SendDialog extends Dialog {
         (RadioButton) findViewById(R.id.sendtogoogle_create_new_map);
     pickMapRadioButton =
         (RadioButton) findViewById(R.id.sendtogoogle_pick_existing_map);
-    RadioButton sendStatsRadioButton = (RadioButton) findViewById(R.id.sendtogoogle_send_stats);
-    sendStatsAndPointsRadioButton = (RadioButton) findViewById(
-        R.id.sendtogoogle_send_stats_and_points);
 
     Button cancel = (Button) findViewById(R.id.sendtogoogle_cancel);
     cancel.setOnClickListener(new View.OnClickListener() {
@@ -124,14 +120,6 @@ public class SendDialog extends Dialog {
       createNewMapRadioButton.setChecked(
           !prefs.getBoolean(
               getContext().getString(R.string.pick_existing_map_key), false));
-      sendStatsAndPointsRadioButton.setChecked(
-          prefs.getBoolean(
-              getContext().getString(R.string.send_stats_and_points_key),
-              false));
-      sendStatsRadioButton.setChecked(
-          !prefs.getBoolean(
-              getContext().getString(R.string.send_stats_and_points_key),
-              false));
     }
   }
 
@@ -154,9 +142,6 @@ public class SendDialog extends Dialog {
         editor.putBoolean(
             getContext().getString(R.string.pick_existing_map_key),
             pickMapRadioButton.isChecked());
-        editor.putBoolean(
-            getContext().getString(R.string.send_stats_and_points_key),
-            sendStatsAndPointsRadioButton.isChecked());
         editor.commit();
       }
     }
@@ -182,8 +167,4 @@ public class SendDialog extends Dialog {
   public boolean getCreateNewMap() {
     return createNewMapRadioButton.isChecked();
   }
-
-  public boolean getSendStatsAndPoints() {
-    return sendStatsAndPointsRadioButton.isChecked();
-  }
 }