From af4a24053b1565a8efc766b7f19017a868ad423a Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 31 Aug 2012 15:08:39 -0700
Subject: [PATCH] merge conflicts, update ids

---
 .../android/apps/mytracks/endtoendtest/DeleteTest.java |  2 +-
 .../apps/mytracks/endtoendtest/EndToEndTestUtils.java  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
index 1bc8d853e..68da315ea 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java
@@ -114,7 +114,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2<TrackListActivi
     EndToEndTestUtils
         .getButtonOnScreen(activityMyTracks.getString(R.string.generic_ok), true, true);
     instrumentation.waitForIdleSync();
-    assertFalse(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_list_stop_recording_button).isEnabled());
+    assertFalse(EndToEndTestUtils.SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop).isEnabled());
   }
 
   @Override
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
index f7190bfc5..b6570068a 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -383,7 +383,7 @@ public class EndToEndTestUtils {
    * Starts recoding track.
    */
   static void startRecording() {
-    View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button);
+    View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
     if(startButton != null && startButton.isShown()) {
       SOLO.clickOnView(startButton);
     } else if (hasActionBar) {
@@ -416,7 +416,7 @@ public class EndToEndTestUtils {
    * Pauses recoding track.
    */
   static void pauseRecording() {
-    View pauseButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button);
+    View pauseButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
     if(pauseButton != null && pauseButton.isShown()) {
       SOLO.clickOnView(pauseButton);
     } else if (hasActionBar) {
@@ -434,7 +434,7 @@ public class EndToEndTestUtils {
    * Resume recoding track.
    */
   static void resumeRecording() {
-    View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button);
+    View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
     if(startButton != null && startButton.isShown()) {
       SOLO.clickOnView(startButton);
     } else if (hasActionBar) {
@@ -454,7 +454,7 @@ public class EndToEndTestUtils {
    * @return true if it is under recording.
    */
   static boolean isUnderRecording() {
-    View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_record_track_button);
+    View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
     if(startButton != null && startButton.isShown()) {
       return false;
     }
@@ -479,7 +479,7 @@ public class EndToEndTestUtils {
    * @param isSave true means should save this track
    */
   static void stopRecording(boolean isSave) {
-    View stopButton = SOLO.getCurrentActivity().findViewById(R.id.track_list_stop_recording_button);
+    View stopButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop);
     if(stopButton != null && stopButton.isShown() ) {
       SOLO.clickOnView(stopButton);
     } else if (hasActionBar) {