merge heads

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/ExportAndImportTest.java

@@ -172,7 +172,7 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
     // No file to imported.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_import), true);
     EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(
-        R.string.external_storage_import_error_no_file,
+        R.string.import_no_file,
         FileUtils.buildExternalDirectoryPath(EndToEndTestUtils.GPX)));
     EndToEndTestUtils
         .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
@@ -199,8 +199,8 @@ public class ExportAndImportTest extends ActivityInstrumentationTestCase2<TrackL
     EndToEndTestUtils.rotateAllActivities();
     // Wait for the prefix of import success string is much faster than wait
     // the whole string.
-    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(
-        R.string.external_storage_import_success_count).split("%")[0]);
+    EndToEndTestUtils.SOLO.waitForText(
+        activityMyTracks.getString(R.string.import_success).split("%")[0]);
     // Check import tracks should be equal with the sum of trackNumber and
     // gpxFilesNumber;
     EndToEndTestUtils

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java

@@ -264,7 +264,7 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
     EndToEndTestUtils
         .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     assertTrue(EndToEndTestUtils.SOLO.waitForText(
-        activityMyTracks.getString(R.string.external_storage_import_success), 0,
+        activityMyTracks.getString(R.string.restore_success), 0,
         EndToEndTestUtils.SUPER_LONG_WAIT_TIME));
     // Check restore track.
     assertTrue(EndToEndTestUtils.SOLO.searchText(EndToEndTestUtils.trackName));