Remove the following strings and drawables

- menu_record_track
- menu_pause_track
- menu_stop_track

Update status and button images.

MyTracks/res/layout/track_controller.xml

@@ -17,7 +17,7 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
   <ImageButton
     android:background="@android:color/transparent"
-    android:contentDescription="@string/menu_record_track"
+    android:contentDescription="@string/icon_record_track"
     android:id="@+id/track_controller_record"
     android:layout_height="100dp"
     android:layout_width="wrap_content"
@@ -45,7 +45,7 @@ limitations under the License.
   </RelativeLayout>
   <ImageButton
     android:background="@android:color/transparent"
-    android:contentDescription="@string/menu_stop_recording"
+    android:contentDescription="@string/icon_stop_recording"
     android:id="@+id/track_controller_stop"
     android:layout_height="100dp"
     android:layout_width="wrap_content"

MyTracks/res/layout/track_widget.xml

@@ -93,13 +93,13 @@ limitations under the License.
       </LinearLayout>
       <ImageButton
         android:background="@drawable/track_widget_record_button_background"
-        android:contentDescription="@string/menu_record_track"
+        android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
         android:src="@drawable/track_widget_record_button"
         style="@style/TrackWidgetButton" />
       <ImageButton
         android:background="@drawable/track_widget_stop_button_background"
-        android:contentDescription="@string/menu_stop_recording"
+        android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
         android:src="@drawable/track_widget_stop_button"
         style="@style/TrackWidgetButton" />

MyTracks/res/values/strings.xml

@@ -890,6 +890,18 @@ limitations under the License.
     translation_description="The accessibility description for the 'My Location' icon.">
     My Location
   </string>
+  <string name="icon_pause_recording"
+    translation_description="The accessibility description for the pause recording icon.">
+    Pause recording
+  </string>
+  <string name="icon_record_track"
+    translation_description="The accessibility description for the record track icon.">
+    Record track
+  </string>
+  <string name="icon_stop_recording"
+    translation_description="The accessibility description for the stop recording icon.">
+    Stop recording
+  </string>
   <string name="icon_track"
     translation_description="The accessibility description for the 'Track' icon.">
     Track
@@ -1082,24 +1094,12 @@ limitations under the License.
       Character limit: ~21 (1 line)">
     Markers
   </string>
-  <string name="menu_pause_track"
-    translation_description="In the menu, to pause a track.
-
-      Character limit: ~21 (1 line)">
-    Pause track
-  </string>
   <string name="menu_play"
     translation_description="In the menu, to play a track.
 
       Character limit: ~21 (1 line)">
     Play
   </string>
-  <string name="menu_record_track"
-    translation_description="In the menu, to start recording a track.
-
-      Character limit: ~21 (1 line)">
-    Record track
-  </string>
   <string name="menu_satellite_mode"
     translation_description="In the menu, to switch the display to the satellite mode.
 
@@ -1171,12 +1171,6 @@ limitations under the License.
       Character limit: ~21 (1 line)">
     Split frequency
   </string>
-  <string name="menu_stop_recording"
-    translation_description="In the menu, to stop recording a track.
-
-      Character limit: ~21 (1 line)">
-    Stop recording
-  </string>
   <string name="menu_voice_frequency"
     translation_description="In the menu, to configure the voice frequency, how frequent to announce
       status.

MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java

@@ -438,9 +438,9 @@ public class SearchListActivity extends AbstractMyTracksActivity implements Dele
     int iconId;
     int iconContentDescriptionId;
     if (isRecording) {
-      iconId = recordingTrackPaused ? R.drawable.menu_pause_track : R.drawable.menu_record_track;
+      iconId = recordingTrackPaused ? R.drawable.status_paused : R.drawable.status_recording;
-      iconContentDescriptionId = recordingTrackPaused ? R.string.menu_pause_track
+      iconContentDescriptionId = recordingTrackPaused ? R.string.icon_pause_recording
-          : R.drawable.menu_record_track;
+          : R.string.icon_record_track;
     } else {
       iconId = TrackIconUtils.getIconDrawable(track.getIcon());
       iconContentDescriptionId = R.string.icon_track;

MyTracks/src/com/google/android/apps/mytracks/TrackController.java

@@ -96,7 +96,7 @@ public class TrackController {
     recordImageButton.setImageResource(
         isRecording && !isPaused ? R.drawable.btn_pause : R.drawable.btn_record);
     recordImageButton.setContentDescription(activity.getString(
-        isRecording && !isPaused ? R.string.menu_pause_track : R.string.menu_record_track));
+        isRecording && !isPaused ? R.string.icon_pause_recording : R.string.icon_record_track));
 
     stopImageButton.setImageResource(isRecording ? R.drawable.btn_stop_1 : R.drawable.btn_stop_0);
     stopImageButton.setEnabled(isRecording);

MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java

@@ -275,10 +275,9 @@ public class TrackListActivity extends FragmentActivity implements DeleteOneTrac
         int iconId;
         int iconContentDescriptionId;
         if (isRecording) {
-          iconId = recordingTrackPaused ? R.drawable.menu_pause_track
+          iconId = recordingTrackPaused ? R.drawable.status_paused : R.drawable.status_recording;
-              : R.drawable.menu_record_track;
+          iconContentDescriptionId = recordingTrackPaused ? R.string.icon_pause_recording
-          iconContentDescriptionId = recordingTrackPaused ? R.string.menu_pause_track
+              : R.string.icon_record_track;
-              : R.string.menu_record_track;
         } else {
           iconId = TrackIconUtils.getIconDrawable(cursor.getString(iconIndex));
           iconContentDescriptionId = R.string.icon_track;

MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java

@@ -342,8 +342,8 @@ public class EndToEndTestUtils {
   public static void createTrackWithPause(int numberOfGpsData) {
     EndToEndTestUtils.startRecording();
     EndToEndTestUtils.sendGps(numberOfGpsData);
-    EndToEndTestUtils.findMenuItem(activityMytracks.getString(R.string.menu_pause_track), true);
+    //EndToEndTestUtils.findMenuItem(activityMytracks.getString(R.string.menu_pause_track), true);
-    EndToEndTestUtils.findMenuItem(activityMytracks.getString(R.string.menu_record_track), true);
+    //EndToEndTestUtils.findMenuItem(activityMytracks.getString(R.string.menu_record_track), true);
     EndToEndTestUtils.sendGps(numberOfGpsData, numberOfGpsData);
     EndToEndTestUtils.stopRecording(true);
   }
@@ -430,21 +430,20 @@ public class EndToEndTestUtils {
    */
   static boolean isUnderRecording() {
     View startButton = SOLO.getCurrentActivity().findViewById(R.id.track_controller_record);
-    if(startButton != null && startButton.isShown()) {
+    if (startButton != null && startButton.isShown()) {
       return false;
     }
-    
+//    if (hasActionBar) { 
-    if (hasActionBar) { 
+//      return getButtonOnScreen(activityMytracks
-      return getButtonOnScreen(activityMytracks
+//        .getString(R.string.menu_record_track), false, false) == null; 
-        .getString(R.string.menu_record_track), false, false) == null; 
+//    }
-    }
+//    showMenuItem();
-    showMenuItem();
+//    if (SOLO.searchText(activityMytracks.getString(R.string.menu_record_track))
-    if (SOLO.searchText(activityMytracks.getString(R.string.menu_record_track))
+//        || SOLO.searchText(activityMytracks.getString(R.string.menu_play))) {
-        || SOLO.searchText(activityMytracks.getString(R.string.menu_play))) {
+//      SOLO.goBack();
-      SOLO.goBack();
+//      return false;
-      return false;
+//    }
-    }
+//    SOLO.goBack();
-    SOLO.goBack();
     return true;
   }