= 0) {
- Toast.makeText(this, R.string.status_marker_inserted,
- Toast.LENGTH_LONG).show();
+ Toast.makeText(this, R.string.marker_insert_success, Toast.LENGTH_LONG).show();
}
return waypointId;
} catch (RemoteException e) {
- Toast.makeText(this, R.string.error_unable_to_insert_marker,
- Toast.LENGTH_LONG).show();
+ Toast.makeText(this, R.string.marker_insert_error, Toast.LENGTH_LONG).show();
throw e;
}
}
@@ -392,7 +390,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
// all exceptions it may throw are no longer wrapped in a RemoteException.
} catch (Exception e) {
Toast.makeText(this,
- getString(R.string.error_unable_to_start_recording),
+ getString(R.string.track_unable_to_start_recording),
Toast.LENGTH_SHORT).show();
Log.w(TAG, "Unable to start recording.", e);
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
index 5e04c6ba8..f24732fef 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java
@@ -73,7 +73,7 @@ public class WaypointsList extends ListActivity
new OnCreateContextMenuListener() {
public void onCreateContextMenu(ContextMenu menu, View v,
ContextMenuInfo menuInfo) {
- menu.setHeaderTitle(R.string.waypointslist_this_waypoint);
+ menu.setHeaderTitle(R.string.marker_list_this_marker);
AdapterView.AdapterContextMenuInfo info =
(AdapterView.AdapterContextMenuInfo) menuInfo;
contextPosition = info.position;
@@ -83,11 +83,11 @@ public class WaypointsList extends ListActivity
if (waypoint != null) {
int type = waypoint.getType();
menu.add(0, Constants.MENU_SHOW, 0,
- R.string.waypointslist_show_waypoint);
+ R.string.marker_list_show_on_map);
menu.add(0, Constants.MENU_EDIT, 0,
- R.string.waypointslist_edit_waypoint);
+ R.string.marker_list_edit_marker);
menu.add(0, Constants.MENU_DELETE, 0,
- R.string.waypointslist_delete_waypoint).setEnabled(
+ R.string.marker_list_delete_marker).setEnabled(
recordingTrackId < 0 || type == Waypoint.TYPE_WAYPOINT ||
info.id != providerUtils.getLastWaypointId(recordingTrackId));
}
@@ -211,8 +211,7 @@ public class WaypointsList extends ListActivity
}
long id = insertWaypoint(request);
if (id < 0) {
- Toast.makeText(this, R.string.error_unable_to_insert_marker,
- Toast.LENGTH_LONG).show();
+ Toast.makeText(this, R.string.marker_insert_error, Toast.LENGTH_LONG).show();
Log.e(Constants.TAG, "Failed to insert marker.");
return;
}
@@ -227,8 +226,7 @@ public class WaypointsList extends ListActivity
if (trackRecordingService != null) {
long waypointId = trackRecordingService.insertWaypoint(request);
if (waypointId >= 0) {
- Toast.makeText(this, R.string.status_marker_inserted,
- Toast.LENGTH_LONG).show();
+ Toast.makeText(this, R.string.marker_insert_success, Toast.LENGTH_LONG).show();
return waypointId;
}
} else {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
index 8b6e83be1..45219922f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java
@@ -339,7 +339,7 @@ public class SendToFusionTables implements Runnable {
if (totalLocationsRead == 0) {
// Put a marker at the first point of the first valid segment:
- String name = track.getName() + " " + context.getString(R.string.start);
+ String name = track.getName() + " " + context.getString(R.string.marker_label_start);
createNewPoint(name, "", loc, MARKER_TYPE_START);
}
@@ -385,7 +385,7 @@ public class SendToFusionTables implements Runnable {
track.setDescription("" + originalDescription + "
"
+ stringUtils.generateTrackDescription(track, distances, elevations)
+ "
");
- String name = track.getName() + " " + context.getString(R.string.end);
+ String name = track.getName() + " " + context.getString(R.string.marker_label_end);
return createNewPoint(name, track.getDescription(), lastLocation, MARKER_TYPE_END);
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
index a5b817dc1..7a149c35a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java
@@ -201,8 +201,8 @@ public class MapsFacade {
iconUrl = END_ICON_URL;
}
String title = trackName + " "
- + (isStart ? context.getString(R.string.start)
- : context.getString(R.string.end));
+ + (isStart ? context.getString(R.string.marker_label_start)
+ : context.getString(R.string.marker_label_end));
String description = isStart ? "" : trackDescription;
return buildMyMapsPlacemarkFeature(title, description, iconUrl, geoPoint);
}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index c32f88c10..6726f7601 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -962,7 +962,7 @@ public class TrackRecordingService extends Service {
wpt.setIcon(request.getIconUrl());
}
if (request.getName() == null) {
- wpt.setName(getString(R.string.waypoint));
+ wpt.setName(getString(R.string.marker_type_waypoint));
} else {
wpt.setName(request.getName());
}
@@ -990,7 +990,7 @@ public class TrackRecordingService extends Service {
// Set the rest of the waypoint data
waypoint.setType(Waypoint.TYPE_STATISTICS);
- waypoint.setName(getString(R.string.statistics));
+ waypoint.setName(getString(R.string.marker_type_statistics));
waypoint.setStatistics(waypointStatsBuilder.getStatistics());
waypoint.setDescription(utils.generateWaypointDescription(waypoint));
waypoint.setIcon(getString(R.string.stats_icon_url));
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
index 16b7af12a..75f28c0c6 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java
@@ -491,7 +491,7 @@ public class TrackRecordingServiceTest
Waypoint wpt = providerUtils.getWaypoint(1);
assertEquals(getContext().getString(R.string.stats_icon_url),
wpt.getIcon());
- assertEquals(getContext().getString(R.string.statistics),
+ assertEquals(getContext().getString(R.string.marker_type_statistics),
wpt.getName());
assertEquals(Waypoint.TYPE_STATISTICS, wpt.getType());
assertEquals(123, wpt.getTrackId());
@@ -527,7 +527,7 @@ public class TrackRecordingServiceTest
Waypoint wpt = providerUtils.getWaypoint(1);
assertEquals(getContext().getString(R.string.waypoint_icon_url),
wpt.getIcon());
- assertEquals(getContext().getString(R.string.waypoint),
+ assertEquals(getContext().getString(R.string.marker_type_waypoint),
wpt.getName());
assertEquals(Waypoint.TYPE_WAYPOINT, wpt.getType());
assertEquals(123, wpt.getTrackId());