Rename save all to export all.

Rename save to export.
Remove send to google menu option.

MyTracks/res/menu/track_detail.xml

@@ -42,54 +42,48 @@ limitations under the License.
     android:title="@string/menu_markers"/>
   <!-- android:orderInCategory="5" is in map.xml -->
   <item
-    android:icon="@drawable/menu_send_google"
+    android:icon="@drawable/menu_export"
-    android:id="@+id/track_detail_send_google"
+    android:id="@+id/track_detail_export"
     android:orderInCategory="6"
-    android:title="@string/menu_send_google"/>
+    android:title="@string/menu_export"/>
-  <item
-    android:icon="@drawable/menu_save"
-    android:id="@+id/track_detail_save"
-    android:orderInCategory="7"
-    android:title="@string/menu_save">
-  </item>
   <item
     android:icon="@drawable/menu_edit"
     android:id="@+id/track_detail_edit"
-    android:orderInCategory="8"
+    android:orderInCategory="7"
     android:title="@string/menu_edit"/>
   <item
     android:icon="@drawable/menu_delete"
     android:id="@+id/track_detail_delete"
-    android:orderInCategory="9"
+    android:orderInCategory="8"
     android:title="@string/menu_delete"/>
   <item
     android:icon="@drawable/menu_voice_frequency"
     android:id="@+id/track_detail_voice_frequency"
-    android:orderInCategory="10"
+    android:orderInCategory="9"
     android:title="@string/menu_voice_frequency"/>
   <item
     android:icon="@drawable/menu_split_frequency"
     android:id="@+id/track_detail_split_frequency"
-    android:orderInCategory="11"
+    android:orderInCategory="10"
     android:title="@string/menu_split_frequency"/>
   <item
     android:icon="@drawable/menu_sensor_state"
     android:id="@+id/track_detail_sensor_state"
-    android:orderInCategory="12"
+    android:orderInCategory="11"
     android:title="@string/menu_sensor_state"/>
   <item
     android:icon="@drawable/menu_settings"
     android:id="@+id/track_detail_settings"
-    android:orderInCategory="13"
+    android:orderInCategory="12"
     android:title="@string/menu_settings"/>
   <item
     android:icon="@drawable/menu_feedback"
     android:id="@+id/track_detail_feedback"
-    android:orderInCategory="14"
+    android:orderInCategory="13"
     android:title="@string/menu_feedback"/>
   <item
     android:icon="@drawable/menu_help"
     android:id="@+id/track_detail_help"
-    android:orderInCategory="15"
+    android:orderInCategory="14"
     android:title="@string/menu_help"/>
 </menu>

MyTracks/res/menu/track_list.xml

@@ -32,9 +32,9 @@ limitations under the License.
     android:title="@string/menu_import_all">
   </item>
   <item
-    android:icon="@drawable/menu_save"
+    android:icon="@drawable/menu_export"
-    android:id="@+id/track_list_save_all"
+    android:id="@+id/track_list_export_all"
-    android:title="@string/menu_save_all">
+    android:title="@string/menu_export_all">
   </item>
   <item
     android:icon="@drawable/menu_delete"

MyTracks/res/values/strings.xml

@@ -1015,6 +1015,18 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Edit
   </string>
+  <string name="menu_export"
+    translation_description="In the menu, to export a track.
+
+      Character limit: ~20 (1 line)">
+    Export
+  </string>
+  <string name="menu_export_all"
+    translation_description="In the menu, to export all tracks.
+
+      Character limit: ~20 (1 line)">
+    Export all
+  </string>
   <string name="menu_feedback"
     translation_description="In the menu, to enter feedback.
 
@@ -1078,30 +1090,12 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Satellite with streets
   </string>
-  <string name="menu_save"
-    translation_description="In the menu, to save a track to the external storage.
-
-      Character limit: ~20 (1 line)">
-    Save
-  </string>
-  <string name="menu_save_all"
-    translation_description="In the menu, to save all the tracks to the external storage.
-
-      Character limit: ~20 (1 line)">
-    Save all
-  </string>
   <string name="menu_search"
     translation_description="In the menu, to start a textual search for tracks or markers.
 
       Character limit: ~20 (1 line)">
     Search
   </string>
-  <string name="menu_send_google"
-    translation_description="In the menu, to send a track to Google.
-
-      Character limit: ~20 (1 line)">
-    Send to Google
-  </string>
   <string name="menu_sensor_state"
     translation_description="In the menu, to go to the sensor state page.
 
@@ -1255,13 +1249,6 @@ limitations under the License.
       %1$s: the directory. E.g., '/storage/sdcard0/MyTracks/gpx/'.">
     Saving to %1$s&#8230;
   </string>
-  <string name="save_selection_option"
-    translation_description="When saving to external storage, the option to save a track as a
-      certain file format.
-
-      %1$s: file format. 'GPX', 'KML', 'CSV', or 'TCX'.">
-    Save as %1$s
-  </string>
   <string name="save_selection_title"
     translation_description="The dialog title to save to external storage.">
     Save to external storage

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

@@ -26,13 +26,9 @@ import com.google.android.apps.mytracks.fragments.ChooseUploadServiceDialogFragm
 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.FileTypeDialogFragment;
-import com.google.android.apps.mytracks.fragments.FileTypeDialogFragment.FileTypeCaller;
 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;
@@ -49,7 +45,6 @@ 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;
@@ -60,8 +55,6 @@ 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.
  * 
@@ -69,7 +62,7 @@ import java.util.Locale;
  * @author Rodrigo Damazio
  */
 public class TrackDetailActivity extends AbstractSendToGoogleActivity
-    implements ChooseUploadServiceCaller, DeleteTrackCaller, FileTypeCaller {
+    implements ChooseUploadServiceCaller, DeleteTrackCaller {
 
   public static final String EXTRA_TRACK_ID = "track_id";
   public static final String EXTRA_MARKER_ID = "marker_id";
@@ -97,8 +90,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
   private MenuItem insertMarkerMenuItem;
   private MenuItem playMenuItem;
   private MenuItem shareMenuItem;
-  private MenuItem sendGoogleMenuItem;
+  private MenuItem exportMenuItem;
-  private MenuItem saveMenuItem;
   private MenuItem voiceFrequencyMenuItem;
   private MenuItem splitFrequencyMenuItem;
   private MenuItem feedbackMenuItem;
@@ -309,8 +301,7 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
 
     insertMarkerMenuItem = menu.findItem(R.id.track_detail_insert_marker);
     playMenuItem = menu.findItem(R.id.track_detail_play);
-    sendGoogleMenuItem = menu.findItem(R.id.track_detail_send_google);
+    exportMenuItem = menu.findItem(R.id.track_detail_export);
-    saveMenuItem = menu.findItem(R.id.track_detail_save);
     voiceFrequencyMenuItem = menu.findItem(R.id.track_detail_voice_frequency);
     splitFrequencyMenuItem = menu.findItem(R.id.track_detail_split_frequency);
     feedbackMenuItem = menu.findItem(R.id.track_detail_split_frequency);
@@ -360,16 +351,11 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
             PreferencesUtils.SPLIT_FREQUENCY_DEFAULT, R.string.menu_split_frequency)
             .show(getSupportFragmentManager(), FrequencyDialogFragment.FREQUENCY_DIALOG_TAG);
         return true;
-      case R.id.track_detail_send_google:
+      case R.id.track_detail_export:
         AnalyticsUtils.sendPageViews(this, "/action/send_google");
         new ChooseUploadServiceDialogFragment().show(getSupportFragmentManager(),
             ChooseUploadServiceDialogFragment.CHOOSE_UPLOAD_SERVICE_DIALOG_TAG);
         return true;
-      case R.id.track_detail_save:
-        FileTypeDialogFragment.newInstance(R.id.track_detail_save, R.string.save_selection_title,
-            R.string.save_selection_option, 4)
-            .show(getSupportFragmentManager(), FileTypeDialogFragment.FILE_TYPE_DIALOG_TAG);
-        return true;
       case R.id.track_detail_edit:
         intent = IntentUtils.newIntent(this, TrackEditActivity.class)
             .putExtra(TrackEditActivity.EXTRA_TRACK_ID, trackId);
@@ -446,21 +432,6 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
     });
   }
 
-  @Override
-  public void onFileTypeDone(int menuId, TrackFileFormat trackFileFormat) {
-    switch (menuId) {
-      case R.id.track_detail_save:
-        AnalyticsUtils.sendPageViews(
-            this, "/action/save_" + trackFileFormat.name().toLowerCase(Locale.US));
-        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);
-        break;
-      default:
-    }
-  }
-
   /**
    * Gets the {@link TrackDataHub}.
    */
@@ -531,11 +502,8 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
     if (shareMenuItem != null && shareMenuItem.isEnabled()) {
       shareMenuItem.setVisible(!isRecording);
     }
-    if (sendGoogleMenuItem != null) {
+    if (exportMenuItem != null) {
-      sendGoogleMenuItem.setVisible(!isRecording);
+      exportMenuItem.setVisible(!isRecording);
-    }
-    if (saveMenuItem != null) {
-      saveMenuItem.setVisible(!isRecording);
     }
     if (voiceFrequencyMenuItem != null) {
       voiceFrequencyMenuItem.setVisible(isRecording);

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

@@ -282,7 +282,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
   private MenuItem searchMenuItem;
   private MenuItem startGpsMenuItem;
   private MenuItem importAllMenuItem;
-  private MenuItem saveAllMenuItem;
+  private MenuItem exportAllMenuItem;
   private MenuItem deleteAllMenuItem;
   private MenuItem syncNowMenuItem;
   private MenuItem feedbackMenuItem;
@@ -457,7 +457,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
     searchMenuItem = menu.findItem(R.id.track_list_search);
     startGpsMenuItem = menu.findItem(R.id.track_list_start_gps);
     importAllMenuItem = menu.findItem(R.id.track_list_import_all);
-    saveAllMenuItem = menu.findItem(R.id.track_list_save_all);
+    exportAllMenuItem = menu.findItem(R.id.track_list_export_all);
     deleteAllMenuItem = menu.findItem(R.id.track_list_delete_all);
     syncNowMenuItem = menu.findItem(R.id.track_list_sync_now);
     feedbackMenuItem = menu.findItem(R.id.track_list_feedback);
@@ -525,9 +525,9 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
             R.string.import_selection_title, R.string.import_selection_option, 2)
             .show(getSupportFragmentManager(), FileTypeDialogFragment.FILE_TYPE_DIALOG_TAG);
         return true;
-      case R.id.track_list_save_all:
+      case R.id.track_list_export_all:
-        FileTypeDialogFragment.newInstance(R.id.track_list_save_all, R.string.save_selection_title,
+        FileTypeDialogFragment.newInstance(R.id.track_list_export_all,
-            R.string.save_all_selection_option, 4)
+            R.string.save_selection_title, R.string.save_all_selection_option, 4)
             .show(getSupportFragmentManager(), FileTypeDialogFragment.FILE_TYPE_DIALOG_TAG);
         return true;
       case R.id.track_list_delete_all:
@@ -607,7 +607,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
   public void onFileTypeDone(int menuId, TrackFileFormat trackFileFormat) {
     Intent intent;
     switch (menuId) {
-      case R.id.track_list_save_all:
+      case R.id.track_list_export_all:
         AnalyticsUtils.sendPageViews(
             this, "/action/save_all_" + trackFileFormat.name().toLowerCase(Locale.US));
         intent = IntentUtils.newIntent(this, SaveActivity.class)
@@ -717,8 +717,8 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
     if (importAllMenuItem != null) {
       importAllMenuItem.setVisible(!isRecording);
     }
-    if (saveAllMenuItem != null) {
+    if (exportAllMenuItem != null) {
-      saveAllMenuItem.setVisible(!isRecording);
+      exportAllMenuItem.setVisible(!isRecording);
     }
     if (deleteAllMenuItem != null) {
       deleteAllMenuItem.setVisible(!isRecording);

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java

@@ -23,6 +23,7 @@ import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.maps.mytracks.R;
 import com.jayway.android.robotium.solo.Solo;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
@@ -545,7 +546,7 @@ public class EndToEndTestUtils {
   public static void saveTrackToSdCard(String trackKind) {
     deleteExportedFiles(trackKind);
     instrumentation.waitForIdleSync();
-    findMenuItem(activityMytracks.getString(R.string.menu_save), true);
+    findMenuItem(activityMytracks.getString(R.string.menu_export), true);
     instrumentation.waitForIdleSync();
     SOLO.clickOnText(trackKind.toUpperCase());
     EndToEndTestUtils
@@ -611,6 +612,7 @@ public class EndToEndTestUtils {
    * 
    * @return false means can not check failed.
    */
+  @SuppressLint("NewApi")
   private static boolean setHasActionBar() {
     try {
       return activityMytracks.getActionBar() == null ? false : true;

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/CreateTrackTest.java

@@ -54,7 +54,7 @@ public class CreateTrackTest extends ActivityInstrumentationTestCase2<TrackListA
   public void testCreateAndSendTrack_notSend() {
     EndToEndTestUtils.createTrackIfEmpty(1, false);
     instrumentation.waitForIdleSync();
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_send_google), true);
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export), true);
     EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.send_google_title));
     EndToEndTestUtils.rotateCurrentActivity();
     instrumentation.waitForIdleSync();

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/DeleteTest.java

@@ -71,7 +71,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     trackListView = EndToEndTestUtils.SOLO.getCurrentListViews();
     assertEquals(0, trackListView.get(0).getCount());
     // Export when there is no track.
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export_all), true);
     EndToEndTestUtils.SOLO.clickOnText(String.format(
         activityMyTracks.getString(R.string.save_all_selection_option),
         EndToEndTestUtils.GPX.toUpperCase()));

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/ExportAndImportTest.java

@@ -88,7 +88,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
     EndToEndTestUtils.deleteExportedFiles(EndToEndTestUtils.GPX);
 
     // Click to export tracks(At least one track) to Gpx files.
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export_all), true);
     EndToEndTestUtils.SOLO.clickOnText(String.format(
         activityMyTracks.getString(R.string.save_all_selection_option),
         EndToEndTestUtils.GPX.toUpperCase()));
@@ -189,7 +189,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
         .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
 
     // Click to export tracks(At least one track) to Gpx files.
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export_all), true);
     EndToEndTestUtils.SOLO.clickOnText(String.format(
         activityMyTracks.getString(R.string.save_all_selection_option),
         EndToEndTestUtils.GPX.toUpperCase()));
@@ -232,7 +232,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
     // Click to export tracks(At least two tracks) to KML files.
     gpxFilesNumber = EndToEndTestUtils.getExportedFiles(EndToEndTestUtils.GPX).length;
     trackNumber = EndToEndTestUtils.SOLO.getCurrentListViews().get(0).getCount();
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_save_all), true);
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export_all), true);
     EndToEndTestUtils.SOLO.clickOnText(String.format(
         activityMyTracks.getString(R.string.save_all_selection_option),
         EndToEndTestUtils.KML.toUpperCase()));

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/SendToGoogleTest.java

@@ -132,7 +132,7 @@ public class SendToGoogleTest extends ActivityInstrumentationTestCase2<TrackList
    * @return true means send successfully
    */
   private boolean sendToGoogle() {
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_send_google), true);
+    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export), true);
     EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.send_google_title));
     instrumentation.waitForIdleSync();
     ArrayList<CheckBox> checkBoxs = EndToEndTestUtils.SOLO.getCurrentCheckBoxes();