karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Rename and reorganize track variables in strings.xml.

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-08 15:59:28 -08:00
parent 63ba6ec37c
commit cf28a3378f
26 changed files with 550 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+1 -1
View File
@@ -130,7 +130,7 @@ public class ExportAllTracks {
}
private void makeProgressDialog(final int trackCount) {
String exportMsg = activity.getString(R.string.tracklist_btn_export_all);
String exportMsg = activity.getString(R.string.track_list_export_all);
progress = new ProgressDialog(activity);
progress.setIcon(android.R.drawable.ic_dialog_info);
progress.setTitle(exportMsg);
MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
+1 -1
View File
@@ -150,7 +150,7 @@ public class ImportAllTracks {
}
private void makeProgressDialog(final int trackCount) {
String importMsg = activity.getString(R.string.tracklist_btn_import_all);
String importMsg = activity.getString(R.string.track_list_import_all);
progress = new ProgressDialog(activity);
progress.setIcon(android.R.drawable.ic_dialog_info);
progress.setTitle(importMsg);
MyTracks/src/com/google/android/apps/mytracks/MapActivity.java
+16 -16
View File
@@ -358,39 +358,39 @@ public class MapActivity extends com.google.android.maps.MapActivity
@Override
public void onCreateContextMenu(ContextMenu menu, View v,
ContextMenuInfo menuInfo) {
menu.setHeaderTitle(R.string.tracklist_this_track);
menu.setHeaderTitle(R.string.track_list_this_track);
menu.add(0, Constants.MENU_EDIT, 0,
R.string.tracklist_edit_track);
R.string.track_list_edit_track);
if (!dataHub.isRecordingSelected()) {
menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
R.string.tracklist_send_to_google);
R.string.track_list_send_google);
SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
R.string.tracklist_share_track);
R.string.track_list_share_track);
share.add(0, Constants.MENU_SHARE_LINK, 0,
R.string.tracklist_share_link);
R.string.track_list_share_url);
share.add(0, Constants.MENU_SHARE_GPX_FILE, 0,
R.string.tracklist_share_gpx_file);
R.string.track_list_share_gpx_file);
share.add(0, Constants.MENU_SHARE_KML_FILE, 0,
R.string.tracklist_share_kml_file);
R.string.track_list_share_kml_file);
share.add(0, Constants.MENU_SHARE_CSV_FILE, 0,
R.string.tracklist_share_csv_file);
R.string.track_list_share_csv_file);
share.add(0, Constants.MENU_SHARE_TCX_FILE, 0,
R.string.tracklist_share_tcx_file);
R.string.track_list_share_tcx_file);
SubMenu save = menu.addSubMenu(0,
Constants.MENU_WRITE_TO_SD_CARD, 0,
R.string.tracklist_write_to_sd);
R.string.track_list_save_sd);
save.add(0, Constants.MENU_SAVE_GPX_FILE, 0,
R.string.tracklist_save_as_gpx);
R.string.track_list_save_gpx_file);
save.add(0, Constants.MENU_SAVE_KML_FILE, 0,
R.string.tracklist_save_as_kml);
R.string.track_list_save_kml_file);
save.add(0, Constants.MENU_SAVE_CSV_FILE, 0,
R.string.tracklist_save_as_csv);
R.string.track_list_save_csv_file);
save.add(0, Constants.MENU_SAVE_TCX_FILE, 0,
R.string.tracklist_save_as_tcx);
R.string.track_list_save_tcx_file);
menu.add(0, Constants.MENU_CLEAR_MAP, 0,
R.string.tracklist_clear_map);
R.string.track_list_clear_map);
menu.add(0, Constants.MENU_DELETE, 0,
R.string.tracklist_delete_track);
R.string.track_list_delete_track);
}
}
};
MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+2 -5
View File
@@ -384,14 +384,11 @@ public class MyTracks extends TabActivity implements OnTouchListener {
long recordingTrackId = trackRecordingService.startNewTrack();
// Select the recording track.
dataHub.loadTrack(recordingTrackId);
Toast.makeText(this, getString(R.string.status_now_recording),
Toast.LENGTH_SHORT).show();
Toast.makeText(this, getString(R.string.track_record_success), Toast.LENGTH_SHORT).show();
// TODO: We catch Exception, because after eliminating the service process
// all exceptions it may throw are no longer wrapped in a RemoteException.
} catch (Exception e) {
Toast.makeText(this,
getString(R.string.track_unable_to_start_recording),
Toast.LENGTH_SHORT).show();
Toast.makeText(this, getString(R.string.track_record_error), Toast.LENGTH_SHORT).show();
Log.w(TAG, "Unable to start recording.", e);
}
}
MyTracks/src/com/google/android/apps/mytracks/TrackList.java
+16 -16
View File
@@ -75,44 +75,44 @@ public class TrackList extends ListActivity
@Override
public void onCreateContextMenu(ContextMenu menu, View v,
ContextMenuInfo menuInfo) {
menu.setHeaderTitle(R.string.tracklist_this_track);
menu.setHeaderTitle(R.string.track_list_this_track);
AdapterView.AdapterContextMenuInfo info =
(AdapterView.AdapterContextMenuInfo) menuInfo;
contextPosition = info.position;
trackId = TrackList.this.listView.getAdapter().getItemId(
contextPosition);
menu.add(0, Constants.MENU_SHOW, 0,
R.string.tracklist_show_track);
R.string.track_list_show_on_map);
menu.add(0, Constants.MENU_EDIT, 0,
R.string.tracklist_edit_track);
R.string.track_list_edit_track);
if (!isRecording() || trackId != recordingTrackId) {
menu.add(0, Constants.MENU_SEND_TO_GOOGLE, 0,
R.string.tracklist_send_to_google);
R.string.track_list_send_google);
SubMenu share = menu.addSubMenu(0, Constants.MENU_SHARE, 0,
R.string.tracklist_share_track);
R.string.track_list_share_track);
share.add(0, Constants.MENU_SHARE_LINK, 0,
R.string.tracklist_share_link);
R.string.track_list_share_url);
share.add(0, Constants.MENU_SHARE_GPX_FILE, 0,
R.string.tracklist_share_gpx_file);
R.string.track_list_share_gpx_file);
share.add(0, Constants.MENU_SHARE_KML_FILE, 0,
R.string.tracklist_share_kml_file);
R.string.track_list_share_kml_file);
share.add(0, Constants.MENU_SHARE_CSV_FILE, 0,
R.string.tracklist_share_csv_file);
R.string.track_list_share_csv_file);
share.add(0, Constants.MENU_SHARE_TCX_FILE, 0,
R.string.tracklist_share_tcx_file);
R.string.track_list_share_tcx_file);
SubMenu save = menu.addSubMenu(0,
Constants.MENU_WRITE_TO_SD_CARD, 0,
R.string.tracklist_write_to_sd);
R.string.track_list_save_sd);
save.add(0, Constants.MENU_SAVE_GPX_FILE, 0,
R.string.tracklist_save_as_gpx);
R.string.track_list_save_gpx_file);
save.add(0, Constants.MENU_SAVE_KML_FILE, 0,
R.string.tracklist_save_as_kml);
R.string.track_list_save_kml_file);
save.add(0, Constants.MENU_SAVE_CSV_FILE, 0,
R.string.tracklist_save_as_csv);
R.string.track_list_save_csv_file);
save.add(0, Constants.MENU_SAVE_TCX_FILE, 0,
R.string.tracklist_save_as_tcx);
R.string.track_list_save_tcx_file);
menu.add(0, Constants.MENU_DELETE, 0,
R.string.tracklist_delete_track);
R.string.track_list_delete_track);
}
}
};
MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+1 -1
View File
@@ -462,7 +462,7 @@ public class SendToFusionTables implements Runnable {
if (totalSegmentsUploaded > 1) {
splitTrack.setName(splitTrack.getName() + " "
+ String.format(
context.getString(R.string.track_part_format), totalSegmentsUploaded));
context.getString(R.string.send_google_track_part_format), totalSegmentsUploaded));
}
totalSegmentsUploaded++;
Log.d(Constants.TAG,
MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java
+1 -1
View File
@@ -331,7 +331,7 @@ public class SendToMyMaps implements Runnable {
if (totalSegmentsUploaded > 1) {
splitTrack.setName(splitTrack.getName() + " "
+ String.format(
context.getString(R.string.track_part_format), totalSegmentsUploaded));
context.getString(R.string.send_google_track_part_format), totalSegmentsUploaded));
}
totalSegmentsUploaded++;
Log.d(TAG,
MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java
+1 -1
View File
@@ -51,7 +51,7 @@ class DefaultTrackNameFactory {
SimpleDateFormat formatter = new SimpleDateFormat(TIMESTAMP_DATE_FORMAT);
return formatter.format(new Date(startTime));
} else {
return String.format(context.getString(R.string.new_track_format), trackId);
return String.format(context.getString(R.string.track_name_format), trackId);
}
}
MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+1 -1
View File
@@ -495,7 +495,7 @@ public class TrackRecordingService extends Service {
this, 0 /* requestCode */, new Intent(this, MyTracks.class),
0 /* flags */);
notification.setLatestEventInfo(this, getString(R.string.app_name),
getString(R.string.recording_your_track), contentIntent);
getString(R.string.track_record_notification), contentIntent);
notification.flags += Notification.FLAG_NO_CLEAR;
apiLevelAdapter.startForeground(this, notificationManager, 1,
notification);