From 0c7f61891e089259dd809c0c7944025f73650195 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Fri, 7 Jun 2013 13:58:12 -0700 Subject: [PATCH] Place kml before gpx --- MyTracks/res/layout/export.xml | 4 ++-- .../res/values/arrays_do_not_translate.xml | 2 +- MyTracks/res/values/strings.xml | 20 +++++++++---------- .../fragments/ExportDialogFragment.java | 12 +++++------ .../mytracks/io/file/TrackFileFormat.java | 12 +++++------ .../services/RemoveTempFilesService.java | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/MyTracks/res/layout/export.xml b/MyTracks/res/layout/export.xml index 3a17b7437..a0ca96f67 100644 --- a/MyTracks/res/layout/export.xml +++ b/MyTracks/res/layout/export.xml @@ -65,10 +65,10 @@ limitations under the License. android:id="@+id/export_external_storage_options" style="@style/ExportRadioGroup" > -1 - GPX KML + GPX CSV TCX diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 34aa43321..61c35da82 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -617,7 +617,7 @@ limitations under the License. translation_description="When exporting all tracks to the external storage, the option to export as a certain file format. - %1$s: file format. 'GPX', 'KML', 'CSV', or 'TCX'."> + %1$s: file format. 'KML', 'GPX', 'CSV', or 'TCX'."> Export all as %1$s + %2$s the directory. E.g., '/storage/sdcard0/MyTracks/kml/'."> Exported %1$d of %2$s to %3$s. + %1$s: file format. 'KML', 'GPX', 'CSV', or 'TCX'."> as %1$s file + %1$s: the directory. E.g., '/storage/sdcard0/MyTracks/kml/'."> Exporting to %1$s… + %2$s the directory. E.g., '/storage/sdcard0/MyTracks/kml/'."> Exported %1$s to %2$s. + %3$s the directory. E.g., '/storage/sdcard0/MyTracks/kml/'."> Imported %1$d of %2$s from %3$s. + %1$s: the directory. E.g., '/storage/sdcard0/MyTracks/kml/'."> %1$s does not exist. + %1$s: the directory. E.g., '/storage/sdcard0/MyTracks/kml/'."> Importing from %1$s… + %1$s: file format. 'KML', 'GPX', 'CSV', or 'TCX'."> Import all %1$s + %2$s the directory. E.g., '/storage/sdcard0/MyTracks/kml/'."> Imported %1$s from %2$s. diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java index a84f0b266..60d36e4b3 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java +++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ExportDialogFragment.java @@ -120,10 +120,10 @@ public class ExportDialogFragment extends DialogFragment { 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_gpx), TrackFileFormat.GPX); setExternalStorageOption( (RadioButton) view.findViewById(R.id.export_external_storage_csv), TrackFileFormat.CSV); setExternalStorageOption( @@ -179,10 +179,10 @@ public class ExportDialogFragment extends DialogFragment { */ 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 GPX: + return R.id.export_external_storage_gpx; case CSV: return R.id.export_external_storage_csv; default: @@ -197,10 +197,10 @@ public class ExportDialogFragment extends DialogFragment { */ 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_gpx: + return TrackFileFormat.GPX; case R.id.export_external_storage_csv: return TrackFileFormat.CSV; default: diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java index a53c2a37a..b4362ee80 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackFileFormat.java @@ -10,18 +10,18 @@ import java.util.Locale; * Definition of all possible track formats. */ public enum TrackFileFormat implements Parcelable { - GPX { - @Override - TrackFormatWriter newFormatWriter(Context context) { - return new GpxTrackWriter(context); - } - }, KML { @Override TrackFormatWriter newFormatWriter(Context context) { return new KmlTrackWriter(context); } }, + GPX { + @Override + TrackFormatWriter newFormatWriter(Context context) { + return new GpxTrackWriter(context); + } + }, CSV { @Override public TrackFormatWriter newFormatWriter(Context context) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java b/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java index 33e18357c..37d690db8 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java @@ -77,8 +77,8 @@ public class RemoveTempFilesService extends Service { // Can't do anything return null; } - cleanTempDirectory(TrackFileFormat.GPX.getExtension()); cleanTempDirectory(TrackFileFormat.KML.getExtension()); + cleanTempDirectory(TrackFileFormat.GPX.getExtension()); cleanTempDirectory(TrackFileFormat.CSV.getExtension()); cleanTempDirectory(TrackFileFormat.TCX.getExtension()); return null;