merge heads

MyTracksTest/src/com/google/android/apps/mytracks/ChartValueSeriesTest.java

@@ -34,7 +34,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
         R.color.elevation_fill,
         R.color.elevation_border,
         new ZoomSettings(5, new int[] {100}),
-        R.string.elevation_label);
+        R.string.stat_elevation);
   }
 
   public void testInitialConditions() {
@@ -44,7 +44,7 @@ public class ChartValueSeriesTest extends AndroidTestCase {
     assertEquals(0, series.getMax());
     assertEquals(0.0, series.getSpread());
     assertEquals(Style.STROKE, series.getPaint().getStyle());
-    assertEquals(getContext().getString(R.string.elevation_label),
+    assertEquals(getContext().getString(R.string.stat_elevation),
         series.getTitle());
     assertTrue(series.isEnabled());
   }

MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java

@@ -126,14 +126,14 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
     if (useMetric) {
       AndroidMock.expect(mockResources.getString(R.string.unit_kilometer))
           .andReturn("km");
-      AndroidMock.expect(mockResources.getString(R.string.kilometer_per_hour))
+      AndroidMock.expect(mockResources.getString(R.string.unit_kilometer_per_hour))
           .andReturn("kph");
       AndroidMock.expect(mockResources.getString(R.string.unit_meter))
           .andReturn("meter");
     } else {
       AndroidMock.expect(mockResources.getString(R.string.unit_mile))
           .andReturn("mile");
-      AndroidMock.expect(mockResources.getString(R.string.mile_per_hour))
+      AndroidMock.expect(mockResources.getString(R.string.unit_mile_per_hour))
           .andReturn("mph");
       AndroidMock.expect(mockResources.getString(R.string.unit_feet))
           .andReturn("feet");

MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java

@@ -214,7 +214,7 @@ public class TrackWriterTest extends AndroidTestCase {
     mocksControl.verify();
 
     assertFalse(writer.wasSuccess());
-    assertEquals(R.string.error_export_operation_canceled, writer.getErrorMessage());
+    assertEquals(R.string.export_canceled, writer.getErrorMessage());
   }
 
   public void testWriteTrack_openFails() {

MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java

@@ -46,11 +46,11 @@ public class TrackPathPainterFactoryTest extends TrackPathPainterTestCase {
       return;
     }
     
-    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_none, 
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.display_track_color_value_none, 
         SingleColorTrackPathPainter.class);
-    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_fixed, 
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.display_track_color_value_fixed, 
         DynamicSpeedTrackPathPainter.class);
-    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_dynamic, 
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.display_track_color_value_dynamic, 
         DynamicSpeedTrackPathPainter.class);
   }
   

MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java

@@ -382,7 +382,7 @@ public class TrackRecordingServiceTest
     Track track = providerUtils.getTrack(id);
     assertNotNull(track);
     assertEquals(id, track.getId());
-    assertEquals(sharedPreferences.getString(context.getString(R.string.default_category_key), ""),
+    assertEquals(sharedPreferences.getString(context.getString(R.string.default_activity_key), ""),
         track.getCategory());
     assertEquals(id, sharedPreferences.getLong(
         context.getString(R.string.recording_track_key), -1));
@@ -491,9 +491,9 @@ public class TrackRecordingServiceTest
     assertEquals(2, service.insertWaypoint(WaypointCreationRequest.DEFAULT_STATISTICS));
 
     Waypoint wpt = providerUtils.getWaypoint(1);
-    assertEquals(getContext().getString(R.string.stats_icon_url),
+    assertEquals(getContext().getString(R.string.marker_statistics_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,9 +527,9 @@ public class TrackRecordingServiceTest
 
     assertEquals(1, service.insertWaypoint(WaypointCreationRequest.DEFAULT_MARKER));
     Waypoint wpt = providerUtils.getWaypoint(1);
-    assertEquals(getContext().getString(R.string.waypoint_icon_url),
+    assertEquals(getContext().getString(R.string.marker_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());