diff --git a/MyTracks/res/drawable-hdpi/menu_send_google.png b/MyTracks/res/drawable-hdpi/menu_export.png similarity index 100% rename from MyTracks/res/drawable-hdpi/menu_send_google.png rename to MyTracks/res/drawable-hdpi/menu_export.png diff --git a/MyTracks/res/drawable-hdpi/menu_save.png b/MyTracks/res/drawable-hdpi/menu_save.png deleted file mode 100644 index 306d55a9c..000000000 Binary files a/MyTracks/res/drawable-hdpi/menu_save.png and /dev/null differ diff --git a/MyTracks/res/drawable-mdpi/menu_send_google.png b/MyTracks/res/drawable-mdpi/menu_export.png similarity index 100% rename from MyTracks/res/drawable-mdpi/menu_send_google.png rename to MyTracks/res/drawable-mdpi/menu_export.png diff --git a/MyTracks/res/drawable-mdpi/menu_save.png b/MyTracks/res/drawable-mdpi/menu_save.png deleted file mode 100644 index ad0769553..000000000 Binary files a/MyTracks/res/drawable-mdpi/menu_save.png and /dev/null differ diff --git a/MyTracks/res/drawable-xhdpi/menu_send_google.png b/MyTracks/res/drawable-xhdpi/menu_export.png similarity index 100% rename from MyTracks/res/drawable-xhdpi/menu_send_google.png rename to MyTracks/res/drawable-xhdpi/menu_export.png diff --git a/MyTracks/res/drawable-xhdpi/menu_save.png b/MyTracks/res/drawable-xhdpi/menu_save.png deleted file mode 100644 index 272060253..000000000 Binary files a/MyTracks/res/drawable-xhdpi/menu_save.png and /dev/null differ diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml index db98bfd8b..6af3ec1d7 100644 --- a/MyTracks/res/menu/track_detail.xml +++ b/MyTracks/res/menu/track_detail.xml @@ -42,54 +42,48 @@ limitations under the License. android:title="@string/menu_markers"/> - - + android:title="@string/menu_export"/> \ No newline at end of file diff --git a/MyTracks/res/menu/track_list.xml b/MyTracks/res/menu/track_list.xml index 09d53d3d2..802280907 100644 --- a/MyTracks/res/menu/track_list.xml +++ b/MyTracks/res/menu/track_list.xml @@ -32,9 +32,9 @@ limitations under the License. android:title="@string/menu_import_all"> + android:icon="@drawable/menu_export" + android:id="@+id/track_list_export_all" + android:title="@string/menu_export_all"> Edit + + Export + + + Export all + Satellite with streets - - Save - - - Save all - Search - - Send to Google - Saving to %1$s… - - Save as %1$s - Save to external storage diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java index 3a48a7c77..7d46c69d1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/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 saveMenuItem; + private MenuItem exportMenuItem; 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); - saveMenuItem = menu.findItem(R.id.track_detail_save); + exportMenuItem = menu.findItem(R.id.track_detail_export); 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) { - sendGoogleMenuItem.setVisible(!isRecording); - } - if (saveMenuItem != null) { - saveMenuItem.setVisible(!isRecording); + if (exportMenuItem != null) { + exportMenuItem.setVisible(!isRecording); } if (voiceFrequencyMenuItem != null) { voiceFrequencyMenuItem.setVisible(isRecording); diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java index 31eefd770..41ee179b6 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java +++ b/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: - FileTypeDialogFragment.newInstance(R.id.track_list_save_all, R.string.save_selection_title, - R.string.save_all_selection_option, 4) + case R.id.track_list_export_all: + FileTypeDialogFragment.newInstance(R.id.track_list_export_all, + 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) { - saveAllMenuItem.setVisible(!isRecording); + if (exportAllMenuItem != null) { + exportAllMenuItem.setVisible(!isRecording); } if (deleteAllMenuItem != null) { deleteAllMenuItem.setVisible(!isRecording); diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java index 9ab8fb1e4..27b7be4cc 100644 --- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java +++ b/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; diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/CreateTrackTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/CreateTrackTest.java index 8830c6242..ecdbf64e4 100644 --- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/CreateTrackTest.java +++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/CreateTrackTest.java @@ -54,7 +54,7 @@ public class CreateTrackTest extends ActivityInstrumentationTestCase2 checkBoxs = EndToEndTestUtils.SOLO.getCurrentCheckBoxes();