From 2f64785a6389223d339d616f32d2116ac653b07b Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 13 Jan 2014 14:25:33 -0800
Subject: [PATCH] Codeclean: accessibility content description

---
 MyTracks/res/layout-land/track_controller.xml |  4 +-
 MyTracks/res/layout-land/track_list.xml       |  6 +-
 .../res/layout/choose_activity_list_item.xml  |  2 +-
 MyTracks/res/layout/list_item.xml             |  8 +--
 MyTracks/res/layout/map.xml                   |  2 +-
 .../res/layout/marker_detail_fragment.xml     |  4 +-
 MyTracks/res/layout/track_controller.xml      |  4 +-
 MyTracks/res/layout/track_list.xml            |  1 +
 MyTracks/res/layout/track_widget_4x1.xml      |  6 +-
 MyTracks/res/layout/track_widget_4x2.xml      |  6 +-
 MyTracks/res/layout/track_widget_4x3.xml      |  6 +-
 MyTracks/res/layout/track_widget_4x4.xml      |  6 +-
 MyTracks/res/values/strings.xml               | 58 ++++++++++++-------
 .../apps/mytracks/MarkerListActivity.java     |  2 +-
 .../apps/mytracks/SearchListActivity.java     |  4 +-
 .../apps/mytracks/TrackController.java        |  2 +-
 .../apps/mytracks/TrackListActivity.java      |  2 +-
 .../apps/mytracks/util/ListItemUtils.java     |  3 +-
 .../maps/MultiColorTrackPathTest.java         |  2 +-
 .../endtoendtest/EndToEndTestUtils.java       |  8 +--
 20 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/MyTracks/res/layout-land/track_controller.xml b/MyTracks/res/layout-land/track_controller.xml
index bc567c224..c1a0c35cd 100644
--- a/MyTracks/res/layout-land/track_controller.xml
+++ b/MyTracks/res/layout-land/track_controller.xml
@@ -29,7 +29,7 @@ limitations under the License.
       android:layout_width="match_parent" />
     <ImageButton
       android:background="@android:color/transparent"
-      android:contentDescription="@string/icon_record_track"
+      android:contentDescription="@string/image_record"
       android:id="@+id/track_controller_record"
       android:layout_height="0dp"
       android:layout_weight="10"
@@ -56,7 +56,7 @@ limitations under the License.
     </RelativeLayout>
     <ImageButton
       android:background="@android:color/transparent"
-      android:contentDescription="@string/icon_stop_recording"
+      android:contentDescription="@string/image_stop"
       android:id="@+id/track_controller_stop"
       android:layout_height="0dp"
       android:layout_weight="10"
diff --git a/MyTracks/res/layout-land/track_list.xml b/MyTracks/res/layout-land/track_list.xml
index 8c0645f54..31a29bfd7 100644
--- a/MyTracks/res/layout-land/track_list.xml
+++ b/MyTracks/res/layout-land/track_list.xml
@@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:baselineAligned="false"
   android:layout_height="match_parent"
   android:layout_width="match_parent" >
   <include layout="@layout/track_controller" />
@@ -41,6 +42,7 @@ limitations under the License.
         android:layout_weight="1"
         android:layout_width="match_parent" />
       <ImageView
+        android:contentDescription="@string/image_arrow"
         android:layout_height="0dp"
         android:layout_weight="10"
         android:layout_width="wrap_content"
@@ -52,10 +54,10 @@ limitations under the License.
     </LinearLayout>
     <LinearLayout
       android:layout_height="match_parent"
-      android:paddingRight="20dp"
       android:layout_toRightOf="@id/track_list_arrow_long"
       android:layout_width="wrap_content"
-      android:orientation="vertical" >
+      android:orientation="vertical"
+      android:paddingRight="20dp" >
       <View
         android:layout_height="0dp"
         android:layout_weight="4"
diff --git a/MyTracks/res/layout/choose_activity_list_item.xml b/MyTracks/res/layout/choose_activity_list_item.xml
index 767051172..d975d5813 100644
--- a/MyTracks/res/layout/choose_activity_list_item.xml
+++ b/MyTracks/res/layout/choose_activity_list_item.xml
@@ -22,7 +22,7 @@ limitations under the License.
   android:paddingLeft="16dp"
   android:paddingRight="16dp" >
   <ImageView
-    android:contentDescription="@string/icon_application"
+    android:contentDescription="@string/image_application"
     android:id="@+id/choose_activity_list_item_icon"
     android:layout_height="@android:dimen/app_icon_size"
     android:layout_width="@android:dimen/app_icon_size"
diff --git a/MyTracks/res/layout/list_item.xml b/MyTracks/res/layout/list_item.xml
index 858ba50bf..1a7461c14 100644
--- a/MyTracks/res/layout/list_item.xml
+++ b/MyTracks/res/layout/list_item.xml
@@ -19,7 +19,7 @@ limitations under the License.
   android:layout_width="match_parent" >
   <!-- Photo -->
   <ImageView
-    android:contentDescription="@string/icon_marker"
+    android:contentDescription="@string/image_photo_marker"
     android:id="@+id/list_item_photo"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
@@ -31,7 +31,7 @@ limitations under the License.
     <!-- A gradient on top of the text -->
     <ImageView
       android:alpha=".6"
-      android:contentDescription="@string/icon_marker"
+      android:contentDescription="@string/image_photo_marker"
       android:id="@+id/list_item_text_gradient"
       android:layout_height="match_parent"
       android:layout_width="match_parent"
@@ -50,7 +50,7 @@ limitations under the License.
       <TableRow>
         <!-- Table 1: Row 1: Column 1: (icon) -->
         <ImageView
-          android:contentDescription="@string/icon_track"
+          android:contentDescription="@string/image_track"
           android:id="@+id/list_item_icon"
           android:layout_gravity="center_vertical"
           android:layout_height="wrap_content"
@@ -91,7 +91,7 @@ limitations under the License.
                 android:singleLine="true"
                 style="@style/TextSmall" />
               <ImageView
-                android:contentDescription="@string/icon_marker"
+                android:contentDescription="@string/image_marker_count"
                 android:id="@+id/list_item_marker_count_icon"
                 android:layout_gravity="bottom"
                 android:layout_height="wrap_content"
diff --git a/MyTracks/res/layout/map.xml b/MyTracks/res/layout/map.xml
index c26aff224..57f0ffed8 100644
--- a/MyTracks/res/layout/map.xml
+++ b/MyTracks/res/layout/map.xml
@@ -31,7 +31,7 @@ limitations under the License.
     style="@style/TextMedium.WithIcon" />
   <ImageButton
     android:background="@drawable/my_location"
-    android:contentDescription="@string/icon_my_location"
+    android:contentDescription="@string/image_my_location"
     android:id="@+id/map_my_location"
     android:layout_alignParentRight="true"
     android:layout_alignParentTop="true"
diff --git a/MyTracks/res/layout/marker_detail_fragment.xml b/MyTracks/res/layout/marker_detail_fragment.xml
index 3c62c2207..9112060b5 100644
--- a/MyTracks/res/layout/marker_detail_fragment.xml
+++ b/MyTracks/res/layout/marker_detail_fragment.xml
@@ -23,7 +23,7 @@ limitations under the License.
     android:layout_width="match_parent" >
     <ImageView
       android:background="@android:color/black"
-      android:contentDescription="@string/icon_marker"
+      android:contentDescription="@string/image_photo_marker"
       android:id="@+id/marker_detail_waypoint_photo"
       android:layout_height="match_parent"
       android:layout_width="match_parent"
@@ -34,7 +34,7 @@ limitations under the License.
       <!-- A gradient on top of the text -->
       <ImageView
         android:alpha=".6"
-        android:contentDescription="@string/icon_marker"
+        android:contentDescription="@string/image_photo_marker"
         android:id="@+id/marker_detail_waypoint_text_gradient"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
diff --git a/MyTracks/res/layout/track_controller.xml b/MyTracks/res/layout/track_controller.xml
index 10d73537a..d732eb990 100644
--- a/MyTracks/res/layout/track_controller.xml
+++ b/MyTracks/res/layout/track_controller.xml
@@ -28,7 +28,7 @@ limitations under the License.
       android:layout_width="0dp" />
     <ImageButton
       android:background="@android:color/transparent"
-      android:contentDescription="@string/icon_record_track"
+      android:contentDescription="@string/image_record"
       android:id="@+id/track_controller_record"
       android:layout_height="wrap_content"
       android:layout_weight="10"
@@ -56,7 +56,7 @@ limitations under the License.
     </RelativeLayout>
     <ImageButton
       android:background="@android:color/transparent"
-      android:contentDescription="@string/icon_stop_recording"
+      android:contentDescription="@string/image_stop"
       android:id="@+id/track_controller_stop"
       android:layout_height="wrap_content"
       android:layout_weight="10"
diff --git a/MyTracks/res/layout/track_list.xml b/MyTracks/res/layout/track_list.xml
index 6cbb7ced7..a8cdca403 100644
--- a/MyTracks/res/layout/track_list.xml
+++ b/MyTracks/res/layout/track_list.xml
@@ -40,6 +40,7 @@ limitations under the License.
         android:layout_weight="1"
         android:layout_width="0dp" />
       <ImageView
+        android:contentDescription="@string/image_arrow"
         android:layout_height="wrap_content"
         android:layout_weight="10"
         android:layout_width="0dp"
diff --git a/MyTracks/res/layout/track_widget_4x1.xml b/MyTracks/res/layout/track_widget_4x1.xml
index e598faeab..f751ae4ee 100644
--- a/MyTracks/res/layout/track_widget_4x1.xml
+++ b/MyTracks/res/layout/track_widget_4x1.xml
@@ -26,7 +26,7 @@ limitations under the License.
       android:layout_weight="1"
       style="@style/TrackWidgetVerticalSpacer" />
     <ImageButton
-      android:contentDescription="@string/icon_record_track"
+      android:contentDescription="@string/image_record"
       android:id="@+id/track_widget_record_button"
       android:src="@drawable/button_record"
       style="@style/TrackWidgetButton" />
@@ -91,7 +91,7 @@ limitations under the License.
       </LinearLayout>
     </LinearLayout>
     <ImageButton
-      android:contentDescription="@string/icon_stop_recording"
+      android:contentDescription="@string/image_stop"
       android:id="@+id/track_widget_stop_button"
       android:src="@drawable/ic_button_stop_disabled"
       style="@style/TrackWidgetButton" />
@@ -100,6 +100,6 @@ limitations under the License.
       style="@style/TrackWidgetVerticalSpacer" />
   </LinearLayout>
   <ImageView
-    android:contentDescription="@string/my_tracks_app_name"
+    android:contentDescription="@string/image_my_tracks_logo"
     style="@style/TrackWidgetLogo" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/MyTracks/res/layout/track_widget_4x2.xml b/MyTracks/res/layout/track_widget_4x2.xml
index 0f818b3b9..9cce20309 100644
--- a/MyTracks/res/layout/track_widget_4x2.xml
+++ b/MyTracks/res/layout/track_widget_4x2.xml
@@ -138,7 +138,7 @@ limitations under the License.
         android:layout_weight="1"
         style="@style/TrackWidgetVerticalSpacer" />
       <ImageButton
-        android:contentDescription="@string/icon_record_track"
+        android:contentDescription="@string/image_record"
         android:id="@+id/track_widget_record_button"
         android:src="@drawable/button_record"      
         style="@style/TrackWidgetButton" />
@@ -146,7 +146,7 @@ limitations under the License.
         android:id="@+id/track_widget_record_status"
         style="@style/TrackWidgetRecordStatus" />
       <ImageButton
-        android:contentDescription="@string/icon_stop_recording"
+        android:contentDescription="@string/image_stop"
         android:id="@+id/track_widget_stop_button"
         android:src="@drawable/ic_button_stop_disabled"
         style="@style/TrackWidgetButton" />
@@ -156,6 +156,6 @@ limitations under the License.
     </LinearLayout>
   </LinearLayout>
   <ImageView
-    android:contentDescription="@string/my_tracks_app_name"
+    android:contentDescription="@string/image_my_tracks_logo"
     style="@style/TrackWidgetLogo" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/MyTracks/res/layout/track_widget_4x3.xml b/MyTracks/res/layout/track_widget_4x3.xml
index b9ff0f56f..c5deedb08 100644
--- a/MyTracks/res/layout/track_widget_4x3.xml
+++ b/MyTracks/res/layout/track_widget_4x3.xml
@@ -138,7 +138,7 @@ limitations under the License.
         android:layout_weight="1"
         style="@style/TrackWidgetVerticalSpacer" />
       <ImageButton
-        android:contentDescription="@string/icon_record_track"
+        android:contentDescription="@string/image_record"
         android:id="@+id/track_widget_record_button"
         android:src="@drawable/button_record"      
         style="@style/TrackWidgetButton" />
@@ -146,7 +146,7 @@ limitations under the License.
         android:id="@+id/track_widget_record_status"
         style="@style/TrackWidgetRecordStatus" />
       <ImageButton
-        android:contentDescription="@string/icon_stop_recording"
+        android:contentDescription="@string/image_stop"
         android:id="@+id/track_widget_stop_button"
         android:src="@drawable/ic_button_stop_disabled"
         style="@style/TrackWidgetButton" />
@@ -156,6 +156,6 @@ limitations under the License.
     </LinearLayout>
   </LinearLayout>
   <ImageView
-    android:contentDescription="@string/my_tracks_app_name"
+    android:contentDescription="@string/image_my_tracks_logo"
     style="@style/TrackWidgetLogo" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/MyTracks/res/layout/track_widget_4x4.xml b/MyTracks/res/layout/track_widget_4x4.xml
index 7fd00ac0e..e3f2bee85 100644
--- a/MyTracks/res/layout/track_widget_4x4.xml
+++ b/MyTracks/res/layout/track_widget_4x4.xml
@@ -142,7 +142,7 @@ limitations under the License.
         android:layout_weight="1"
         style="@style/TrackWidgetVerticalSpacer" />
       <ImageButton
-        android:contentDescription="@string/icon_record_track"
+        android:contentDescription="@string/image_record"
         android:id="@+id/track_widget_record_button"
         android:src="@drawable/button_record"      
         style="@style/TrackWidgetButton" />
@@ -150,7 +150,7 @@ limitations under the License.
         android:id="@+id/track_widget_record_status"
         style="@style/TrackWidgetRecordStatus" />
       <ImageButton
-        android:contentDescription="@string/icon_stop_recording"
+        android:contentDescription="@string/image_stop"
         android:id="@+id/track_widget_stop_button"
         android:src="@drawable/ic_button_stop_disabled"
         style="@style/TrackWidgetButton" />
@@ -160,6 +160,6 @@ limitations under the License.
     </LinearLayout>
   </LinearLayout>
   <ImageView
-    android:contentDescription="@string/my_tracks_app_name"
+    android:contentDescription="@string/image_my_tracks_logo"
     style="@style/TrackWidgetLogo4x4" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index f16acb159..d5d9a6cb0 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -886,37 +886,53 @@ limitations under the License.
     Waiting for GPS signal
   </string>
 
-  <!-- Icon -->
-  <string name="icon_application"
-    translation_description="When sharing a track, we display a list of Android applications on the
-      device that can be used. This is the generic accessibility description for any application
-      icon.">
+  <!-- Image -->
+  <string name="image_application"
+    translation_description="The accessibility description for a generic application icon.">
     Application
   </string>
-  <string name="icon_marker"
-    translation_description="The accessibility description for the 'Marker' icon.">
+  <string name="image_arrow"
+    translation_description="The accessibility description for an arrow image.">
+    Arrow
+  </string>
+  <string name="image_marker"
+    translation_description="The accessibility description for a marker icon, as opposed to a track
+      icon.">
     Marker
   </string>
-  <string name="icon_my_location"
-    translation_description="The accessibility description for the 'My Location' icon.">
+  <string name="image_marker_count"
+    translation_description="The accessibility description for the marker count icon.">
+    Marker count
+  </string>
+  <string name="image_my_location"
+    translation_description="The accessibility description for the 'My Location' button.">
     My Location
   </string>
-  <string name="icon_pause_recording"
-    translation_description="The accessibility description for the pause recording icon.">
-    Pause recording
+  <string name="image_my_tracks_logo"
+    translation_description="The accessibility description for the 'My Tracks' logo.">
+    My Tracks logo
   </string>
-  <string name="icon_record_track"
-    translation_description="The accessibility description for the record track icon.">
-    Record track
+  <string name="image_pause"
+    translation_description="The accessibility description for the pause button.">
+    Pause
   </string>
-  <string name="icon_stop_recording"
-    translation_description="The accessibility description for the stop recording icon.">
-    Stop recording
+  <string name="image_photo_marker"
+    translation_description="The accessibility description for a photo marker">
+    Photo marker
   </string>
-  <string name="icon_track"
-    translation_description="The accessibility description for the 'Track' icon.">
+  <string name="image_record"
+    translation_description="The accessibility description for the record button.">
+    Record
+  </string>
+  <string name="image_stop"
+    translation_description="The accessibility description for the stop button.">
+    Stop
+  </string>
+  <string name="image_track"
+    translation_description="The accessibility description for a track icon, as opposed to a marker
+      icon.">
     Track
-  </string>
+  </string>      
 
   <!-- Import -->
   <string name="import_error"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
index befbb3e3d..fff828226 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
@@ -189,7 +189,7 @@ public class MarkerListActivity extends AbstractMyTracksActivity implements Dele
         String photoUrl = cursor.getString(photoUrlIndex);
 
         ListItemUtils.setListItem(MarkerListActivity.this, view, false, true, iconId,
-            R.string.icon_marker, name, null, null, null, 0, time, false, category, description,
+            R.string.image_marker, name, null, null, null, 0, time, false, category, description,
             photoUrl);
       }
     };
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
index e390fead5..3d7639fb7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
@@ -487,7 +487,7 @@ public class SearchListActivity extends AbstractSendToGoogleActivity implements
     resultMap.put(IS_PAUSED_FIELD, true);
     resultMap.put(ICON_ID_FIELD,
         statistics ? R.drawable.ic_marker_yellow_pushpin : R.drawable.ic_marker_blue_pushpin);
-    resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.icon_marker);
+    resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.image_marker);
     resultMap.put(NAME_FIELD, waypoint.getName());
     resultMap.put(SHARED_OWNER_FIELD, null);
     // Display the marker's track name in the total time field
@@ -517,7 +517,7 @@ public class SearchListActivity extends AbstractSendToGoogleActivity implements
     resultMap.put(IS_RECORDING_FIELD, track.getId() == recordingTrackId);
     resultMap.put(IS_PAUSED_FIELD, recordingTrackPaused);
     resultMap.put(ICON_ID_FIELD, TrackIconUtils.getIconDrawable(icon));
-    resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.icon_track);
+    resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.image_track);
     resultMap.put(NAME_FIELD, track.getName());
     resultMap.put(SHARED_OWNER_FIELD, track.getSharedOwner());
     resultMap.put(TOTAL_TIME_FIELD, StringUtils.formatElapsedTime(tripStatitics.getTotalTime()));
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackController.java b/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
index 54fe4d2b4..ceb1bfb9a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
@@ -106,7 +106,7 @@ public class TrackController {
     recordImageButton.setImageResource(
         isRecording && !isPaused ? R.drawable.button_pause : R.drawable.button_record);
     recordImageButton.setContentDescription(activity.getString(
-        isRecording && !isPaused ? R.string.icon_pause_recording : R.string.icon_record_track));
+        isRecording && !isPaused ? R.string.image_pause : R.string.image_record));
 
     stopImageButton.setImageResource(
         isRecording ? R.drawable.button_stop : R.drawable.ic_button_stop_disabled);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
index c2f261b25..cbe89e713 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackListActivity.java
@@ -383,7 +383,7 @@ public class TrackListActivity extends AbstractSendToGoogleActivity
         String description = cursor.getString(descriptionIndex);
 
         ListItemUtils.setListItem(TrackListActivity.this, view, isRecording, recordingTrackPaused,
-            iconId, R.string.icon_track, name, sharedOwner, totalTime, totalDistance, markerCount,
+            iconId, R.string.image_track, name, sharedOwner, totalTime, totalDistance, markerCount,
             startTime, true, category, description, null);
       }
     };
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java
index 37a355473..1223b304b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/ListItemUtils.java
@@ -88,8 +88,7 @@ public class ListItemUtils {
     // Set icon
     if (isRecording) {
       iconId = isPaused ? R.drawable.ic_track_paused : R.drawable.ic_track_recording;
-      iconContentDescriptionId = isPaused ? R.string.icon_pause_recording
-          : R.string.icon_record_track;
+      iconContentDescriptionId = isPaused ? R.string.image_pause : R.string.image_record;
     }
 
     ImageView iconImageView = (ImageView) view.findViewById(R.id.list_item_icon);
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/MultiColorTrackPathTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/MultiColorTrackPathTest.java
index 07f54e962..c388fab8b 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/MultiColorTrackPathTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/MultiColorTrackPathTest.java
@@ -35,7 +35,7 @@ public class MultiColorTrackPathTest extends AndroidTestCase {
   }
 
   /**
-   * Tests the {@link MultiColorTrackPath#getColor(int)} when use dynamic speed
+   * Tests the {@link MultiColorTrackPath#getColor(double)} when use dynamic speed
    * track path descriptor.
    */
   public void testGetColor_DynamicSpeedTrackPathDescriptor() {
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
index c5a183c49..eedd7d842 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -894,7 +894,7 @@ public class EndToEndTestUtils {
    */
   public static void checkNotRecording() {
     instrumentation.waitForIdleSync();
-    Assert.assertEquals(activityMytracks.getString(R.string.icon_record_track), (String) SOLO
+    Assert.assertEquals(activityMytracks.getString(R.string.image_record), (String) SOLO
         .getCurrentActivity().findViewById(R.id.track_controller_record).getContentDescription());
     Assert.assertFalse(SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop)
         .isEnabled());
@@ -910,7 +910,7 @@ public class EndToEndTestUtils {
    */
   public static void checkUnderRecording() {
     instrumentation.waitForIdleSync();
-    Assert.assertEquals(activityMytracks.getString(R.string.icon_pause_recording), (String) SOLO
+    Assert.assertEquals(activityMytracks.getString(R.string.image_pause), (String) SOLO
         .getCurrentActivity().findViewById(R.id.track_controller_record).getContentDescription());
     Assert.assertTrue(SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop)
         .isEnabled());
@@ -930,7 +930,7 @@ public class EndToEndTestUtils {
    */
   public static void checkUnderPaused() {
     instrumentation.waitForIdleSync();
-    Assert.assertEquals(activityMytracks.getString(R.string.icon_record_track), (String) SOLO
+    Assert.assertEquals(activityMytracks.getString(R.string.image_record), (String) SOLO
         .getCurrentActivity().findViewById(R.id.track_controller_record).getContentDescription());
     Assert.assertTrue(SOLO.getCurrentActivity().findViewById(R.id.track_controller_stop)
         .isEnabled());
@@ -1001,7 +1001,7 @@ public class EndToEndTestUtils {
       for (ImageButton imageButton : aa) {
         if (imageButton.getContentDescription() != null
             && imageButton.getContentDescription().equals(
-                activity.getString(R.string.icon_my_location))) {
+                activity.getString(R.string.image_my_location))) {
           myLocation = imageButton;
           break;
         }