merge heads

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_operation_cancelled, writer.getErrorMessage());
+    assertEquals(R.string.error_export_operation_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_none, 
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_none, 
         SingleColorTrackPathPainter.class);
-    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_fixed, 
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_fixed, 
         DynamicSpeedTrackPathPainter.class);
-    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_dynamic, 
+    testTrackPathPainterFactorySpecific(context, prefs, R.string.track_color_mode_value_dynamic, 
         DynamicSpeedTrackPathPainter.class);
   }
   

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

@@ -625,7 +625,7 @@ public class TrackRecordingServiceTest
   @MediumTest
   public void testWithProperties_zephyrSensorType() throws Exception {
     functionalTest(R.string.sensor_type_key,
-        context.getString(R.string.zephyr_sensor_type));
+        context.getString(R.string.sensor_type_value_zephyr));
   }
 
   private ITrackRecordingService bindAndGetService(Intent intent) {

MyTracksTest/src/com/google/android/apps/mytracks/services/sensors/SensorManagerFactoryTest.java

@@ -30,17 +30,17 @@ public class SensorManagerFactoryTest extends AndroidTestCase {
   
   @SmallTest
   public void testCreateZephyr() throws Exception {
-    assertClassForName(ZephyrSensorManager.class, R.string.zephyr_sensor_type);
+    assertClassForName(ZephyrSensorManager.class, R.string.sensor_type_value_zephyr);
   }
   
   @SmallTest
   public void testCreateAnt() throws Exception {
-    assertClassForName(AntDirectSensorManager.class, R.string.ant_sensor_type);
+    assertClassForName(AntDirectSensorManager.class, R.string.sensor_type_value_ant);
   }
 
   @SmallTest
   public void testCreateAntSRM() throws Exception {
-    assertClassForName(AntSRMSensorManager.class, R.string.srm_ant_bridge_sensor_type);
+    assertClassForName(AntSRMSensorManager.class, R.string.sensor_type_value_srm_ant_bridge);
   }
 
   private void assertClassForName(Class<?> c, int i) {