Merge "Add a11y content descriptions and label mapping to Dreams." into jb-mr1-dev

res/layout/dream_info_row.xml

@@ -54,7 +54,8 @@
             android:ellipsize="end"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textDirection="locale" />
+            android:textDirection="locale"
+            android:labelFor="@android:id/button2" />
 
         <!-- Dream radio button -->
 
@@ -64,7 +65,9 @@
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:duplicateParentState="true" />
+            android:duplicateParentState="true"
+            android:clickable="false"
+            android:focusable="false" />
     </RelativeLayout>
 
     <!-- Divider -->
@@ -90,7 +93,7 @@
         android:layout_centerVertical="true"
         android:layout_margin="0dip"
         android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@null"
+        android:contentDescription="@string/screensaver_settings_button"
         android:padding="8dip"
         android:src="@drawable/ic_bt_config" />
 

res/values/strings.xml

@@ -1793,6 +1793,8 @@
     <string name="screensaver_settings_when_to_dream">When to sleep</string>
     <!-- Dream settings screen, button label to start dreaming -->
     <string name="screensaver_settings_dream_start">Sleep now</string>
+    <!-- Dream settings screen, button label for settings for a specific screensaver -->
+    <string name="screensaver_settings_button">Settings</string>
     <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
     <string name="automatic_brightness">Automatic brightness</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->