Merge commit '5cb300ef' into manualmerge

Change-Id: I0a250709eca34fcbbfdd94cf1cf25195bce844b8
diff --git a/res/layout/playback_layout.xml b/res/layout/playback_layout.xml
index aa3ab47..2f4d33c 100644
--- a/res/layout/playback_layout.xml
+++ b/res/layout/playback_layout.xml
@@ -55,6 +55,7 @@
                 android:layout_height="match_parent"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/ic_speakerphone_on"
+                android:contentDescription="@string/description_playback_speakerphone"
             />
         </LinearLayout>
     </LinearLayout>
@@ -86,6 +87,7 @@
             android:layout_marginStart="64dip"
             android:max="0"
             android:layout_centerVertical="true"
+            android:contentDescription="@string/description_playback_seek"
         />
         <TextView
             android:id="@+id/playback_position_text"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 17984fd..455fd5d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -289,6 +289,36 @@
     -->
     <string name="description_digits_edittext">number to dial</string>
 
+    <!-- String describing the button in the voicemail playback to start/stop playback.
+
+         Used by AccessibilityService to announce the purpose of the view.
+    -->
+    <string name="description_playback_start_stop">Play or stop playback</string>
+
+    <!-- String describing the button in the voicemail playback to switch on/off speakerphone.
+
+         Used by AccessibilityService to announce the purpose of the view.
+    -->
+    <string name="description_playback_speakerphone">Switch on or off speakerphone</string>
+
+    <!-- String describing the seekbar in the voicemail playback to seek playback position.
+
+         Used by AccessibilityService to announce the purpose of the view.
+    -->
+    <string name="description_playback_seek">Seek playback position</string>
+
+    <!-- String describing the button in the voicemail playback to decrease playback rate.
+
+         Used by AccessibilityService to announce the purpose of the view.
+    -->
+    <string name="description_rate_decrease">Decrease playback rate</string>
+
+    <!-- String describing the button in the voicemail playback to increase playback rate.
+
+         Used by AccessibilityService to announce the purpose of the view.
+    -->
+    <string name="description_rate_increase">Increase playback rate</string>
+
     <!-- Content description for the fake action menu button that brings up the call history
          activity -->
     <string name="action_menu_call_history_description">Call History</string>