Merge heads

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/DeleteTest.java

@@ -73,13 +73,14 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     // Export when there is no track.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export_all), true);
     EndToEndTestUtils.SOLO.clickOnText(String.format(
-        activityMyTracks.getString(R.string.save_all_selection_option),
+        activityMyTracks.getString(R.string.export_external_storage_option),
         EndToEndTestUtils.GPX.toUpperCase()));
     EndToEndTestUtils.getButtonOnScreen(
         EndToEndTestUtils.activityMytracks.getString(R.string.generic_ok), true, true);
     String totalTracks = activityMyTracks.getResources().getQuantityString(R.plurals.tracks, 0, 0);
     String directoryName = FileUtils.buildExternalDirectoryPath(EndToEndTestUtils.GPX);
-    String message = activityMyTracks.getString(R.string.save_error, 0, totalTracks, directoryName);
+    String message = activityMyTracks.getString(
+        R.string.export_external_storage_error, 0, totalTracks, directoryName);
     assertTrue(EndToEndTestUtils.SOLO.waitForText(
         activityMyTracks.getString(R.string.external_storage_not_available), 1,
         EndToEndTestUtils.SHORT_WAIT_TIME)

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/MenuItemsTest.java

@@ -22,9 +22,6 @@ import com.google.android.maps.mytracks.R;
 import android.app.Instrumentation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.KeyEvent;
-import android.view.View;
-
-import java.util.ArrayList;
 
 /**
  * Tests some menu items of MyTracks.
@@ -35,7 +32,6 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
 
   private Instrumentation instrumentation;
   private TrackListActivity activityMyTracks;
-  private final static String SHARE_ITEM_PARENT_VIEW_NAME = "RecycleListView";
 
   public MenuItemsTest() {
     super(TrackListActivity.class);
@@ -110,30 +106,6 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
     return activityMyTracks.findViewById(R.id.track_controler_container).isShown();
   }
 
-  /**
-   * Gets the view to click the share item by item index.
-   * 
-   * @param index of a share item
-   * @return null when no such item
-   */
-  private View findShareItem(int index) {
-    EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_share), true);
-    EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.generic_yes));
-    ArrayList<View> views = EndToEndTestUtils.SOLO.getViews();
-    int i = 0;
-    for (View view : views) {
-      String name = view.getParent().getClass().getName();
-      // Each share item is a child of a "RecycleListView"
-      if (name.indexOf(SHARE_ITEM_PARENT_VIEW_NAME) > 0) {
-        if (index == i) {
-          return view;
-        }
-        i++;
-      }
-    }
-    return null;
-  }
-
   /**
    * Checks the voice frequency and split frequency menus during recording. When
    * recording, they should be in both the menu and the recording settings. When

MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/common/SendToGoogleTest.java

@@ -133,7 +133,7 @@ public class SendToGoogleTest extends ActivityInstrumentationTestCase2<TrackList
    */
   private boolean sendToGoogle() {
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_export), true);
-    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.export_dialog_title));
+    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.export_title));
     instrumentation.waitForIdleSync();
     ArrayList<CheckBox> checkBoxs = EndToEndTestUtils.SOLO.getCurrentCheckBoxes();
     for (int i = 0; i < checkBoxs.size(); i++) {