Combine save and send to google into export.

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

@@ -139,10 +139,10 @@ public abstract class AbstractSendToGoogleActivity extends AbstractMyTracksActiv
 
     // Check Drive permission
     boolean needDrivePermission = sendRequest.isSendDrive();
-    if (!needDrivePermission) {
-      boolean defaultTablePublic = PreferencesUtils.getBoolean(
-          this, R.string.default_table_public_key, PreferencesUtils.DEFAULT_TABLE_PUBLIC_DEFAULT);
-      needDrivePermission = defaultTablePublic && sendRequest.isSendFusionTables();
+    if (!needDrivePermission && sendRequest.isSendFusionTables()) {
+      needDrivePermission = PreferencesUtils.getBoolean(this,
+          R.string.export_google_fusion_tables_public_key,
+          PreferencesUtils.EXPORT_GOOGLE_FUSION_TABLES_PUBLIC_DEFAULT);
     }
     if (!needDrivePermission) {
       needDrivePermission = sendRequest.isSendSpreadsheets();

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

@@ -22,13 +22,16 @@ import com.google.android.apps.mytracks.content.TrackDataHub;
 import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 import com.google.android.apps.mytracks.fragments.ChartFragment;
-import com.google.android.apps.mytracks.fragments.ChooseUploadServiceDialogFragment;
-import com.google.android.apps.mytracks.fragments.ChooseUploadServiceDialogFragment.ChooseUploadServiceCaller;
 import com.google.android.apps.mytracks.fragments.DeleteTrackDialogFragment;
 import com.google.android.apps.mytracks.fragments.DeleteTrackDialogFragment.DeleteTrackCaller;
+import com.google.android.apps.mytracks.fragments.ExportDialogFragment;
+import com.google.android.apps.mytracks.fragments.ExportDialogFragment.ExportCaller;
+import com.google.android.apps.mytracks.fragments.ExportDialogFragment.ExportType;
 import com.google.android.apps.mytracks.fragments.FrequencyDialogFragment;
 import com.google.android.apps.mytracks.fragments.MyTracksMapFragment;
 import com.google.android.apps.mytracks.fragments.StatsFragment;
+import com.google.android.apps.mytracks.io.file.SaveActivity;
+import com.google.android.apps.mytracks.io.file.TrackFileFormat;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;
 import com.google.android.apps.mytracks.settings.SettingsActivity;
@@ -45,6 +48,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.v4.app.TaskStackBuilder;
 import android.support.v4.view.ViewPager;
 import android.view.Menu;
@@ -55,6 +59,8 @@ import android.view.View.OnClickListener;
 import android.widget.TabHost;
 import android.widget.TabHost.TabSpec;
 
+import java.util.Locale;
+
 /**
  * An activity to show the track detail.
  * 
@@ -62,7 +68,7 @@ import android.widget.TabHost.TabSpec;
  * @author Rodrigo Damazio
  */
 public class TrackDetailActivity extends AbstractSendToGoogleActivity
-    implements ChooseUploadServiceCaller, DeleteTrackCaller {
+    implements ExportCaller, DeleteTrackCaller {
 
   public static final String EXTRA_TRACK_ID = "track_id";
   public static final String EXTRA_MARKER_ID = "marker_id";
@@ -352,9 +358,9 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
             .show(getSupportFragmentManager(), FrequencyDialogFragment.FREQUENCY_DIALOG_TAG);
         return true;
       case R.id.track_detail_export:
-        AnalyticsUtils.sendPageViews(this, "/action/send_google");
-        new ChooseUploadServiceDialogFragment().show(getSupportFragmentManager(),
-            ChooseUploadServiceDialogFragment.CHOOSE_UPLOAD_SERVICE_DIALOG_TAG);
+        AnalyticsUtils.sendPageViews(this, "/export");
+        new ExportDialogFragment().show(getSupportFragmentManager(),
+            ExportDialogFragment.EXPORT_DIALOG_TAG);
         return true;
       case R.id.track_detail_edit:
         intent = IntentUtils.newIntent(this, TrackEditActivity.class)
@@ -398,23 +404,33 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
   }
 
   @Override
-  public void onChooseUploadServiceDone(boolean sendMaps, boolean sendFusionTables,
-      boolean sendSpreadsheets, boolean mapsExistingMap) {
-    SendRequest sendRequest = new SendRequest(trackId);
-    sendRequest.setSendMaps(sendMaps);
-    sendRequest.setSendFusionTables(sendFusionTables);
-    sendRequest.setSendSpreadsheets(sendSpreadsheets);
-    sendRequest.setMapsExistingMap(mapsExistingMap);
-    if (sendMaps) {
-      AnalyticsUtils.sendPageViews(this, "/send/maps");
+  public void onExportDone(ExportType exportType, TrackFileFormat trackFileFormat) {
+    String pageView;
+    if (exportType == ExportType.EXTERNAL_STORAGE) {
+      pageView = "/export/external_storage_" + trackFileFormat.name().toLowerCase(Locale.US);
+      AnalyticsUtils.sendPageViews(this, pageView);
+      Intent intent = IntentUtils.newIntent(this, SaveActivity.class)
+          .putExtra(SaveActivity.EXTRA_TRACK_IDS, new long[] { trackId })
+          .putExtra(SaveActivity.EXTRA_TRACK_FILE_FORMAT, (Parcelable) trackFileFormat);
+      startActivity(intent);
+    } else {
+      SendRequest sendRequest = new SendRequest(trackId);
+      switch (exportType) {
+        case GOOGLE_MAPS:
+          pageView = "/export/maps";
+          sendRequest.setSendMaps(true);
+          break;
+        case GOOGLE_FUSION_TABLES:
+          pageView = "/export/fusion_tables";
+          sendRequest.setSendFusionTables(true);
+          break;
+        default:
+          pageView = "/export/spreadsheets";
+          sendRequest.setSendSpreadsheets(true);
+      }
+      AnalyticsUtils.sendPageViews(this, pageView);
+      sendToGoogle(sendRequest);
     }
-    if (sendFusionTables) {
-      AnalyticsUtils.sendPageViews(this, "/send/fusion_tables");
-    }
-    if (sendSpreadsheets) {
-      AnalyticsUtils.sendPageViews(this, "/send/spreadsheets");
-    }
-    sendToGoogle(sendRequest);
   }
 
   @Override

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

@@ -1,166 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.google.android.apps.mytracks.fragments;
-
-import com.google.android.apps.mytracks.util.PreferencesUtils;
-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.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentActivity;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.RadioButton;
-import android.widget.TableRow;
-import android.widget.Toast;
-
-/**
- * A DialogFragment to choose upload service.
- * 
- * @author Jimmy Shih
- */
-public class ChooseUploadServiceDialogFragment extends DialogFragment {
-
-  /**
-   * Interface for caller of this dialog fragment.
-   * 
-   * @author Jimmy Shih
-   */
-  public interface ChooseUploadServiceCaller {
-
-    /**
-     * Called when choose upload service is done.
-     */
-    public void onChooseUploadServiceDone(boolean sendMaps, boolean sendFusionTables,
-        boolean sendSpreadsheets, boolean mapsExistingMap);
-  }
-
-  public static final String CHOOSE_UPLOAD_SERVICE_DIALOG_TAG = "chooseUploadService";
-
-  private ChooseUploadServiceCaller caller;
-  private FragmentActivity fragmentActivity;
-
-  private CheckBox mapsCheckBox;
-  private CheckBox fusionTablesCheckBox;
-  private CheckBox spreadsheetsCheckBox;
-
-  private TableRow mapsOptionTableRow;
-  private RadioButton existingMapRadioButton;
-
-  @Override
-  public void onAttach(Activity activity) {
-    super.onAttach(activity);
-    try {
-      caller = (ChooseUploadServiceCaller) activity;
-    } catch (ClassCastException e) {
-      throw new ClassCastException(activity.toString() + " must implement "
-          + ChooseUploadServiceCaller.class.getSimpleName());
-    }
-  }
-
-  @Override
-  public Dialog onCreateDialog(Bundle savedInstanceState) {
-    fragmentActivity = getActivity();
-
-    View view = fragmentActivity.getLayoutInflater().inflate(R.layout.choose_upload_service, null);
-
-    mapsCheckBox = (CheckBox) view.findViewById(R.id.choose_upload_service_maps);
-    fusionTablesCheckBox = (CheckBox) view.findViewById(R.id.choose_upload_service_fusion_tables);
-    spreadsheetsCheckBox = (CheckBox) view.findViewById(R.id.choose_upload_service_spreadsheets);
-
-    mapsCheckBox.setChecked(PreferencesUtils.getBoolean(
-        fragmentActivity, R.string.send_to_maps_key, PreferencesUtils.SEND_TO_MAPS_DEFAULT));
-    fusionTablesCheckBox.setChecked(PreferencesUtils.getBoolean(
-        fragmentActivity, R.string.send_to_fusion_tables_key,
-        PreferencesUtils.SEND_TO_FUSION_TABLES_DEFAULT));
-
-    spreadsheetsCheckBox.setChecked(PreferencesUtils.getBoolean(
-        fragmentActivity, R.string.send_to_spreadsheets_key,
-        PreferencesUtils.SEND_TO_SPREADSHEETS_DEFAULT));
-
-    mapsCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-      public void onCheckedChanged(CompoundButton button, boolean checked) {
-        updateMapsOption();
-      }
-    });
-
-    mapsOptionTableRow = (TableRow) view.findViewById(R.id.choose_upload_service_maps_options);
-
-    RadioButton newMapRadioButton = (RadioButton) view.findViewById(
-        R.id.choose_upload_service_new_map);
-    boolean defaultMapPublic = PreferencesUtils.getBoolean(
-        fragmentActivity, R.string.default_map_public_key, PreferencesUtils.DEFAULT_MAP_PUBLIC_DEFAULT);
-    newMapRadioButton.setText(defaultMapPublic ? R.string.send_google_new_public_map
-        : R.string.send_google_new_unlisted_map);
-
-    existingMapRadioButton = (RadioButton) view.findViewById(
-        R.id.choose_upload_service_existing_map);
-
-    updateMapsOption();
-    if (PreferencesUtils.getBoolean(
-        fragmentActivity, R.string.pick_existing_map_key, PreferencesUtils.PICK_EXISTING_MAP_DEFAULT)) {
-      existingMapRadioButton.setChecked(true);
-    } else {
-      newMapRadioButton.setChecked(true);
-    }
-
-    // Update fusion table
-    boolean defaultTablePublic = PreferencesUtils.getBoolean(
-        fragmentActivity, R.string.default_table_public_key, PreferencesUtils.DEFAULT_TABLE_PUBLIC_DEFAULT);
-    String text = getString(R.string.send_google_fusion_tables) + "\n"
-        + getString(defaultTablePublic ? R.string.send_google_fusion_tables_public
-            : R.string.send_google_fusion_tables_private);
-    fusionTablesCheckBox.setText(text);
-
-    return new AlertDialog.Builder(fragmentActivity).setNegativeButton(R.string.generic_cancel, null)
-        .setPositiveButton(R.string.send_google_send_now, new DialogInterface.OnClickListener() {
-            @Override
-          public void onClick(DialogInterface dialog, int which) {
-            PreferencesUtils.setBoolean(
-                fragmentActivity, R.string.pick_existing_map_key, existingMapRadioButton.isChecked());
-            PreferencesUtils.setBoolean(
-                fragmentActivity, R.string.send_to_maps_key, mapsCheckBox.isChecked());
-            PreferencesUtils.setBoolean(
-                fragmentActivity, R.string.send_to_fusion_tables_key, fusionTablesCheckBox.isChecked());
-            PreferencesUtils.setBoolean(
-                fragmentActivity, R.string.send_to_spreadsheets_key, spreadsheetsCheckBox.isChecked());
-            if (mapsCheckBox.isChecked() || fusionTablesCheckBox.isChecked()
-                || spreadsheetsCheckBox.isChecked()) {
-              caller.onChooseUploadServiceDone(mapsCheckBox.isChecked(),
-                  fusionTablesCheckBox.isChecked(), spreadsheetsCheckBox.isChecked(),
-                  existingMapRadioButton.isChecked());
-            } else {
-              Toast.makeText(fragmentActivity, R.string.send_google_no_service_selected, Toast.LENGTH_LONG)
-                  .show();
-            }
-          }
-        }).setTitle(R.string.send_google_title).setView(view).create();
-  }
-
-  /**
-   * Updates map option.
-   */
-  private void updateMapsOption() {
-    mapsOptionTableRow.setVisibility(mapsCheckBox.isChecked() ? View.VISIBLE : View.GONE);
-  }
-}

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

@@ -0,0 +1,246 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.android.apps.mytracks.fragments;
+
+import com.google.android.apps.mytracks.io.file.TrackFileFormat;
+import com.google.android.apps.mytracks.util.PreferencesUtils;
+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.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.FragmentActivity;
+import android.view.View;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.RadioGroup.OnCheckedChangeListener;
+
+/**
+ * A DialogFragment to export a track.
+ * 
+ * @author Jimmy Shih
+ */
+public class ExportDialogFragment extends DialogFragment {
+
+  /**
+   * Export types.
+   * 
+   * @author Jimmy Shih
+   */
+  public enum ExportType {
+    GOOGLE_MAPS, GOOGLE_FUSION_TABLES, GOOGLE_SPREADSHEET, EXTERNAL_STORAGE
+  }
+
+  /**
+   * Interface for caller of this dialog fragment.
+   * 
+   * @author Jimmy Shih
+   */
+  public interface ExportCaller {
+
+    /**
+     * Called when export is done.
+     */
+    public void onExportDone(ExportType exportType, TrackFileFormat trackFileFormat);
+  }
+
+  public static final String EXPORT_DIALOG_TAG = "export";
+
+  private ExportCaller caller;
+  private RadioGroup exportTypeOptions;
+  private RadioGroup exportGoogleMapsOptions;
+  private RadioGroup exportGoogleFusionTablesOptions;
+  private RadioGroup exportExternalStorageOptions;
+
+  @Override
+  public void onAttach(Activity activity) {
+    super.onAttach(activity);
+    try {
+      caller = (ExportCaller) activity;
+    } catch (ClassCastException e) {
+      throw new ClassCastException(
+          activity.toString() + " must implement " + ExportCaller.class.getSimpleName());
+    }
+  }
+
+  @Override
+  public Dialog onCreateDialog(Bundle savedInstanceState) {
+    FragmentActivity fragmentActivity = getActivity();
+
+    View view = fragmentActivity.getLayoutInflater().inflate(R.layout.export, null);
+
+    exportTypeOptions = (RadioGroup) view.findViewById(R.id.export_type_options);
+    exportGoogleMapsOptions = (RadioGroup) view.findViewById(R.id.export_google_maps_options);
+    exportGoogleFusionTablesOptions = (RadioGroup) view.findViewById(
+        R.id.export_google_fusion_tables_options);
+    exportExternalStorageOptions = (RadioGroup) view.findViewById(
+        R.id.export_external_storage_options);
+
+    exportTypeOptions.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+        @Override
+      public void onCheckedChanged(RadioGroup group, int checkedId) {
+        exportGoogleMapsOptions.setVisibility(
+            checkedId == R.id.export_google_maps ? View.VISIBLE : View.GONE);
+        exportGoogleFusionTablesOptions.setVisibility(
+            checkedId == R.id.export_google_fusion_tables ? View.VISIBLE : View.GONE);
+        exportExternalStorageOptions.setVisibility(
+            checkedId == R.id.export_external_storage ? View.VISIBLE : View.GONE);
+      }
+    });
+    ExportType exportType = ExportType.valueOf(PreferencesUtils.getString(
+        fragmentActivity, R.string.export_type_key, PreferencesUtils.EXPORT_TYPE_DEFAULT));
+    exportTypeOptions.check(getExportTypeId(exportType));
+
+    boolean exportGoogleMapsPublic = PreferencesUtils.getBoolean(fragmentActivity,
+        R.string.export_google_maps_public_key, PreferencesUtils.EXPORT_GOOGLE_MAPS_PUBLIC_DEFAULT);
+    exportGoogleMapsOptions.check(
+        exportGoogleMapsPublic ? R.id.export_google_maps_public : R.id.export_google_maps_unlisted);
+
+    boolean exportGoogleFusionTablesPublic = PreferencesUtils.getBoolean(fragmentActivity,
+        R.string.export_google_fusion_tables_public_key,
+        PreferencesUtils.EXPORT_GOOGLE_FUSION_TABLES_PUBLIC_DEFAULT);
+    exportGoogleFusionTablesOptions.check(
+        exportGoogleFusionTablesPublic ? R.id.export_google_fusion_tables_public
+            : R.id.export_google_fusion_tables_private);
+
+    setExternalStorageOption(
+        (RadioButton) view.findViewById(R.id.export_external_storage_gpx), TrackFileFormat.GPX);
+    setExternalStorageOption(
+        (RadioButton) view.findViewById(R.id.export_external_storage_kml), TrackFileFormat.KML);
+    setExternalStorageOption(
+        (RadioButton) view.findViewById(R.id.export_external_storage_csv), TrackFileFormat.CSV);
+    setExternalStorageOption(
+        (RadioButton) view.findViewById(R.id.export_external_storage_tcx), TrackFileFormat.TCX);
+    TrackFileFormat trackFileFormat = TrackFileFormat.valueOf(PreferencesUtils.getString(
+        fragmentActivity, R.string.export_external_storage_format_key,
+        PreferencesUtils.EXPORT_EXTERNAL_STORAGE_FORMAT_DEFAULT));
+    exportExternalStorageOptions.check(getExternalStorageFormatId(trackFileFormat));
+
+    return new AlertDialog.Builder(fragmentActivity).setNegativeButton(
+        R.string.generic_cancel, null)
+        .setPositiveButton(R.string.menu_export, new DialogInterface.OnClickListener() {
+            @Override
+          public void onClick(DialogInterface dialog, int which) {
+            FragmentActivity context = getActivity();
+            int id = exportTypeOptions.getCheckedRadioButtonId();
+            ExportType type = getExportType(id);
+            TrackFileFormat format = null;
+
+            PreferencesUtils.setString(context, R.string.export_type_key, type.name());
+            if (id == R.id.export_google_maps) {
+              PreferencesUtils.setBoolean(context, R.string.export_google_maps_public_key,
+                  exportGoogleMapsOptions.getCheckedRadioButtonId()
+                  == R.id.export_google_maps_public);
+            } else if (id == R.id.export_google_fusion_tables) {
+              PreferencesUtils.setBoolean(context, R.string.export_google_fusion_tables_public_key,
+                  exportGoogleFusionTablesOptions.getCheckedRadioButtonId()
+                  == R.id.export_google_fusion_tables_public);
+            } else if (id == R.id.export_external_storage) {
+              format = getTrackFileFormat(exportExternalStorageOptions.getCheckedRadioButtonId());
+              PreferencesUtils.setString(
+                  context, R.string.export_external_storage_format_key, format.name());
+            }
+            caller.onExportDone(type, format);
+          }
+        }).setTitle(R.string.export_dialog_title).setView(view).create();
+  }
+
+  /**
+   * Sets an external storage option.
+   * 
+   * @param radioButton the radio button
+   * @param trackFileFormat the track file format
+   */
+  private void setExternalStorageOption(RadioButton radioButton, TrackFileFormat trackFileFormat) {
+    radioButton.setText(getString(R.string.export_external_storage_option, trackFileFormat.name()));
+  }
+
+  /**
+   * Gets the external storage format id from a track file format.
+   * 
+   * @param trackFileFormat the track file format
+   */
+  private int getExternalStorageFormatId(TrackFileFormat trackFileFormat) {
+    switch (trackFileFormat) {
+      case GPX:
+        return R.id.export_external_storage_gpx;
+      case KML:
+        return R.id.export_external_storage_kml;
+      case CSV:
+        return R.id.export_external_storage_csv;
+      default:
+        return R.id.export_external_storage_tcx;
+    }
+  }
+
+  /**
+   * Gets the track file format from an external storage format id.
+   * 
+   * @param externalStorageFormatId the external storage format id
+   */
+  private TrackFileFormat getTrackFileFormat(int externalStorageFormatId) {
+    switch (externalStorageFormatId) {
+      case R.id.export_external_storage_gpx:
+        return TrackFileFormat.GPX;
+      case R.id.export_external_storage_kml:
+        return TrackFileFormat.KML;
+      case R.id.export_external_storage_csv:
+        return TrackFileFormat.CSV;
+      default:
+        return TrackFileFormat.TCX;
+    }
+  }
+
+  /**
+   * Gets the export type id from an export type.
+   * 
+   * @param exportType the export type
+   */
+  private int getExportTypeId(ExportType exportType) {
+    switch (exportType) {
+      case GOOGLE_MAPS:
+        return R.id.export_google_maps;
+      case GOOGLE_FUSION_TABLES:
+        return R.id.export_google_fusion_tables;
+      case GOOGLE_SPREADSHEET:
+        return R.id.export_google_spreadsheets;
+      default:
+        return R.id.export_external_storage;
+    }
+  }
+
+  /**
+   * Gets the export type from an export type id.
+   * 
+   * @param exportTypeId the export type id
+   */
+  private ExportType getExportType(int exportTypeId) {
+    switch (exportTypeId) {
+      case R.id.export_google_maps:
+        return ExportType.GOOGLE_MAPS;
+      case R.id.export_google_fusion_tables:
+        return ExportType.GOOGLE_FUSION_TABLES;
+      case R.id.export_google_spreadsheets:
+        return ExportType.GOOGLE_SPREADSHEET;
+      default:
+        return ExportType.EXTERNAL_STORAGE;
+    }
+  }
+}

MyTracks/src/com/google/android/apps/mytracks/io/drive/SendDriveActivity.java

@@ -44,7 +44,7 @@ public class SendDriveActivity extends AbstractSendActivity {
 
   @Override
   protected String getServiceName() {
-    return getString(R.string.send_google_drive);
+    return getString(R.string.export_google_drive);
   }
 
   @Override

MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesActivity.java

@@ -41,7 +41,7 @@ public class SendFusionTablesActivity extends AbstractSendActivity {
 
   @Override
   protected String getServiceName() {
-    return getString(R.string.send_google_fusion_tables);
+    return getString(R.string.export_google_fusion_tables);
   }
 
   @Override

MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesAsyncTask.java

@@ -202,8 +202,8 @@ public class SendFusionTablesAsyncTask extends AbstractSendAsyncTask {
 
   private boolean setPermission(String tableId) throws IOException, GoogleAuthException {
     boolean defaultTablePublic = PreferencesUtils.getBoolean(context,
-        R.string.default_table_public_key,
-        PreferencesUtils.DEFAULT_TABLE_PUBLIC_DEFAULT);
+        R.string.export_google_fusion_tables_public_key,
+        PreferencesUtils.EXPORT_GOOGLE_FUSION_TABLES_PUBLIC_DEFAULT);
     if (!defaultTablePublic) {
       return true;
     }

MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsActivity.java

@@ -42,7 +42,7 @@ public class SendMapsActivity extends AbstractSendActivity {
 
   @Override
   protected String getServiceName() {
-    return getString(R.string.send_google_maps);
+    return getString(R.string.export_google_maps);
   }
 
   @Override

MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsAsyncTask.java

@@ -222,8 +222,9 @@ public class SendMapsAsyncTask extends AbstractSendAsyncTask {
       mapId = chooseMapId;
       return true;
     } else {
-      boolean defaultMapPublic = PreferencesUtils.getBoolean(
-          context, R.string.default_map_public_key, PreferencesUtils.DEFAULT_MAP_PUBLIC_DEFAULT);
+      boolean defaultMapPublic = PreferencesUtils.getBoolean(context,
+          R.string.export_google_maps_public_key,
+          PreferencesUtils.EXPORT_GOOGLE_MAPS_PUBLIC_DEFAULT);
       try {
         String description = track.getCategory() + "\n" + track.getDescription() + "\n"
             + context.getString(R.string.send_google_by_my_tracks, "", "");

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

@@ -81,8 +81,9 @@ public class UploadResultActivity extends FragmentActivity implements ChooseActi
     }
     if (shareUrl == null && sendRequest.isSendFusionTables()
         && sendRequest.isFusionTablesSuccess()) {
-      boolean defaultTablePublic = PreferencesUtils.getBoolean(
-          this, R.string.default_table_public_key, PreferencesUtils.DEFAULT_TABLE_PUBLIC_DEFAULT);
+      boolean defaultTablePublic = PreferencesUtils.getBoolean(this,
+          R.string.export_google_fusion_tables_public_key,
+          PreferencesUtils.EXPORT_GOOGLE_FUSION_TABLES_PUBLIC_DEFAULT);
       if (defaultTablePublic) {
         shareUrl = SendFusionTablesUtils.getMapUrl(track);
       }

MyTracks/src/com/google/android/apps/mytracks/io/spreadsheets/SendSpreadsheetsActivity.java

@@ -39,7 +39,7 @@ public class SendSpreadsheetsActivity extends AbstractSendActivity {
 
   @Override
   protected String getServiceName() {
-    return getString(R.string.send_google_spreadsheets);
+    return getString(R.string.export_google_spreadsheets);
   }
 
   @Override

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

@@ -113,16 +113,7 @@ public class GoogleSettingsActivity extends AbstractSettingsActivity {
         }
         return false;
       }
-    });
-
-    CheckBoxPreference defaultMapPublicPreference = (CheckBoxPreference) findPreference(
-        getString(R.string.default_map_public_key));
-    defaultMapPublicPreference.setSummaryOn(getString(
-        R.string.settings_google_maps_public_summary_on,
-        getString(R.string.maps_public_unlisted_url)));
-    defaultMapPublicPreference.setSummaryOff(getString(
-        R.string.settings_google_maps_public_summary_off,
-        getString(R.string.maps_public_unlisted_url)));
+    });  
 
     updateUiByAccountName(PreferencesUtils.getString(
         this, R.string.google_account_key, PreferencesUtils.GOOGLE_ACCOUNT_DEFAULT));

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

@@ -17,6 +17,8 @@
 package com.google.android.apps.mytracks.util;
 
 import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.fragments.ExportDialogFragment.ExportType;
+import com.google.android.apps.mytracks.io.file.TrackFileFormat;
 import com.google.android.gms.location.DetectedActivity;
 
 import android.annotation.SuppressLint;
@@ -59,12 +61,15 @@ public class PreferencesUtils {
   public static final boolean CONFIRM_SHARE_MAPS_DEFAULT = true;
 
   public static final String DEFAULT_ACTIVITY_DEFAULT = "";
-  public static final boolean DEFAULT_MAP_PUBLIC_DEFAULT = false;
-  public static final boolean DEFAULT_TABLE_PUBLIC_DEFAULT = false;
   public static final String DRIVE_DELETED_LIST_DEFAULT = "";
   public static final long DRIVE_LARGEST_CHANGE_ID_DEFAULT = -1L;
   public static final boolean DRIVE_SYNC_DEFAULT = false;
 
+  public static final String EXPORT_EXTERNAL_STORAGE_FORMAT_DEFAULT = TrackFileFormat.KML.name();
+  public static final boolean EXPORT_GOOGLE_FUSION_TABLES_PUBLIC_DEFAULT = false;
+  public static final boolean EXPORT_GOOGLE_MAPS_PUBLIC_DEFAULT = false;
+  public static final String EXPORT_TYPE_DEFAULT = ExportType.GOOGLE_MAPS.name();
+  
   // Value for split_frequency_key and voice_frequency_key
   public static final int FREQUENCY_OFF = 0;
 
@@ -86,16 +91,11 @@ public class PreferencesUtils {
   public static final int MIN_REQUIRED_ACCURACY_EXCELLENT = 10;
   public static final int MIN_REQUIRED_ACCURACY_POOR = 5000;
 
-  public static final boolean PICK_EXISTING_MAP_DEFAULT = false;
   public static final long RECORDING_TRACK_ID_DEFAULT = -1L;
   public static final boolean RECORDING_TRACK_PAUSED_DEFAULT = true;
   public static final boolean REPORT_SPEED_DEFAULT = true;
   public static final long SELECTED_TRACK_ID_DEFAULT = -1L;
 
-  public static final boolean SEND_TO_FUSION_TABLES_DEFAULT = false;
-  public static final boolean SEND_TO_MAPS_DEFAULT = false;
-  public static final boolean SEND_TO_SPREADSHEETS_DEFAULT = false;
-
   public static final String SENSOR_TYPE_DEFAULT = "NONE";
   public static final String SHARE_TRACK_DEFAULT = "DRIVE";
   public static final int SPLIT_FREQUENCY_DEFAULT = 0;