Fixed all Accessibility lint warnings in Settings app.

Change-Id: Ida98444f8942d3618d84c0a6f78cc3653ea4ad24

35 files changed, 122 insertions, 36 deletions

diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
index 3361603ad..f8a939f4e 100644
--- a/res/layout-land/crypt_keeper_progress.xml
+++ b/res/layout-land/crypt_keeper_progress.xml
@@ -69,6 +69,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/encroid_waiting"
+            android:contentDescription="@null"
         />
 
         <Button
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
index d94b2f4a1..a8f565147 100644
--- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
@@ -37,6 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:src="@drawable/encroid_resignin"
+            android:contentDescription="@null"
         />
 
         <TextView android:id="@+id/passwordLabel"
diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index f8c113d92..1e33230c7 100644
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -34,6 +34,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:src="@drawable/encroid_resignin"
+            android:contentDescription="@null"
         />
 
         <TextView android:id="@+id/passwordLabel"
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
index f958f0010..176c9fbd6 100644
--- a/res/layout-sw600dp/crypt_keeper_progress.xml
+++ b/res/layout-sw600dp/crypt_keeper_progress.xml
@@ -33,6 +33,7 @@
             android:layout_alignParentBottom="true"
             android:paddingRight="65dip"
             android:src="@drawable/encroid_waiting"
+            android:contentDescription="@null"
         />
 
         <TextView
diff --git a/res/layout/account_preference.xml b/res/layout/account_preference.xml
index 5e2edc6db..bc3f8f9b2 100644
--- a/res/layout/account_preference.xml
+++ b/res/layout/account_preference.xml
@@ -18,4 +18,5 @@
         android:id="@+id/syncStatusIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:contentDescription="@null" />
diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml
index e91ec50a8..8ce90d760 100644
--- a/res/layout/android_beam.xml
+++ b/res/layout/android_beam.xml
@@ -41,6 +41,7 @@
             <ImageView android:id="@+id/android_beam_image"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:contentDescription="@null"
             />
         </LinearLayout>
 
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index 949999a34..eee61658a 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -30,7 +30,8 @@
         android:layout_height="48dip"
         android:layout_rowSpan="3"
         android:layout_marginRight="8dip"
-        android:scaleType="centerInside" />
+        android:scaleType="centerInside"
+        android:contentDescription="@null" />
 
     <TextView
         android:id="@android:id/title"
diff --git a/res/layout/bookmark_picker_item.xml b/res/layout/bookmark_picker_item.xml
index a0d71c67b..b4ffe733a 100644
--- a/res/layout/bookmark_picker_item.xml
+++ b/res/layout/bookmark_picker_item.xml
@@ -26,7 +26,8 @@
     <ImageView android:id="@+id/icon"
         android:layout_width="@android:dimen/app_icon_size"
         android:layout_height="@android:dimen/app_icon_size"
-        android:scaleType="fitCenter" />
+        android:scaleType="fitCenter"
+        android:contentDescription="@null" />
 
     <TextView android:id="@+id/title"
         android:layout_width="match_parent"
diff --git a/res/layout/crypt_keeper_blank.xml b/res/layout/crypt_keeper_blank.xml
index 1c880c2d4..2cd9c91f8 100644
--- a/res/layout/crypt_keeper_blank.xml
+++ b/res/layout/crypt_keeper_blank.xml
@@ -27,6 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:src="@drawable/encroid_progress"
+        android:contentDescription="@null"
     />
 
 </LinearLayout>
diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
index bdb4945b5..97afe6a86 100644
--- a/res/layout/crypt_keeper_password_field.xml
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -35,6 +35,7 @@
        android:layout_height="wrap_content"
        android:src="@drawable/ic_lockscreen_ime"
        android:clickable="true"
+       android:contentDescription="@string/crypt_keeper_switch_input_method"
        android:padding="8dip"
        android:layout_gravity="center"
        android:background="?android:attr/selectableItemBackground"
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
index 35760cf69..0d408c264 100644
--- a/res/layout/crypt_keeper_progress.xml
+++ b/res/layout/crypt_keeper_progress.xml
@@ -64,6 +64,7 @@
         android:layout_weight="1"
         android:layout_gravity="bottom|right"
         android:src="@drawable/encroid_waiting"
+        android:contentDescription="@null"
     />
 
     <Button
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
index 0ce17d245..6c09d09bc 100644
--- a/res/layout/data_usage_detail.xml
+++ b/res/layout/data_usage_detail.xml
@@ -40,7 +40,8 @@
                 android:id="@+id/app_icon"
                 android:layout_width="48dip"
                 android:layout_height="48dip"
-                android:scaleType="centerInside" />
+                android:scaleType="centerInside"
+                android:contentDescription="@null" />
 
             <LinearLayout
                 android:id="@+id/app_titles"
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index d6a0dcb9e..3b4824f74 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -44,7 +44,8 @@
                     android:layout_height="@android:dimen/app_icon_size"
                     android:layout_marginRight="16dip"
                     android:layout_gravity="center_vertical"
-                    android:scaleType="fitCenter"/>
+                    android:scaleType="fitCenter"
+                    android:contentDescription="@null" />
                 <TextView android:id="@+id/admin_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -74,7 +75,8 @@
                     <ImageView android:id="@+id/add_msg_expander"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical" />
+                        android:gravity="center_vertical"
+                        android:contentDescription="@null" />
                     <TextView android:id="@+id/add_msg"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index fe9e45a17..24dab5ed0 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -38,6 +38,7 @@
             android:layout_width="@android:dimen/app_icon_size"
             android:layout_height="@android:dimen/app_icon_size"
             android:layout_gravity="center_vertical"
+            android:contentDescription="@null"
             />
     </LinearLayout>
 
diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml
index e5c58d00b..18fe4f029 100644
--- a/res/layout/dream_picker_row.xml
+++ b/res/layout/dream_picker_row.xml
@@ -26,7 +26,8 @@
     <ImageView android:id="@+id/icon"
         android:layout_width="@android:dimen/app_icon_size"
         android:layout_height="@android:dimen/app_icon_size"
-        android:scaleType="fitCenter" />
+        android:scaleType="fitCenter"
+        android:contentDescription="@null" />
 
     <TextView android:id="@+id/title"
         android:layout_width="match_parent"
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index c41bdb611..f623d04b6 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -95,7 +95,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/total_size_text"
                     android:paddingTop="6dip"
@@ -131,7 +132,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/application_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
@@ -168,7 +170,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/external_code_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
@@ -206,7 +209,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
@@ -243,7 +247,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/external_data_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
@@ -298,7 +303,8 @@
                     android:layout_marginLeft="1dip"
                     android:layout_marginRight="1dip"
                     android:layout_marginBottom="4dip"
-                    android:scaleType="center" />
+                    android:scaleType="center"
+                    android:contentDescription="@null" />
                 <TextView
                     android:id="@+id/cache_size_text"
                     android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/res/layout/keyboard_layout_dialog_switch_hint.xml b/res/layout/keyboard_layout_dialog_switch_hint.xml
index 336d543d1..af8c3f451 100644
--- a/res/layout/keyboard_layout_dialog_switch_hint.xml
+++ b/res/layout/keyboard_layout_dialog_switch_hint.xml
@@ -23,7 +23,8 @@
         android:layout_height="1dip"
         android:scaleType="fitXY"
         android:gravity="fill_horizontal"
-        android:src="@android:drawable/divider_horizontal_dark" />
+        android:src="@android:drawable/divider_horizontal_dark"
+        android:contentDescription="@null" />
 
     <TextView
         android:layout_width="match_parent"
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index 78d9a0201..6708647eb 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -33,7 +33,8 @@
         android:layout_height="@android:dimen/app_icon_size"
         android:layout_marginRight="11dip"
         android:layout_gravity="center_vertical"
-        android:scaleType="fitCenter"/>
+        android:scaleType="fitCenter"
+        android:contentDescription="@null"/>
 
     <LinearLayout
         android:orientation="vertical"
diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml
index e10c65fb7..5a7aee5b6 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -26,6 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:src="@drawable/nav_divider"
+        android:contentDescription="@null"
          />
 
     <!-- Details button -->
@@ -36,6 +37,7 @@
         android:layout_gravity="center_vertical"
         android:padding="8dip"
         android:background="?android:attr/selectableItemBackground"
-        android:src="@drawable/ic_bt_config" />
+        android:src="@drawable/ic_bt_config"
+        android:contentDescription="@string/bluetooth_device_details" />
 
 </LinearLayout>
diff --git a/res/layout/preference_bluetooth_profile.xml b/res/layout/preference_bluetooth_profile.xml
index 1ed971e9f..f8e6bdc9c 100644
--- a/res/layout/preference_bluetooth_profile.xml
+++ b/res/layout/preference_bluetooth_profile.xml
@@ -26,6 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:src="@drawable/nav_divider"
+        android:contentDescription="@null"
          />
 
     <!-- Details button -->
@@ -36,6 +37,7 @@
         android:layout_gravity="center_vertical"
         android:padding="8dip"
         android:background="?android:attr/selectableItemBackground"
-        android:src="@drawable/ic_bt_config" />
+        android:src="@drawable/ic_bt_config"
+        android:contentDescription="@string/bluetooth_profile_details" />
 
 </LinearLayout>
diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
index a6893e7a0..82c6f281a 100644
--- a/res/layout/preference_dialog_brightness.xml
+++ b/res/layout/preference_dialog_brightness.xml
@@ -31,7 +31,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingTop="20dip"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:contentDescription="@null" />
 
         <CheckBox android:id="@+id/automatic_mode"
                 android:layout_width="match_parent"
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index 2c83f12c5..a92f0ef16 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -30,7 +30,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingTop="20dip"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                android:contentDescription="@null" />
 
         <!-- Dummy -->
         <SeekBar android:id="@*android:id/seekbar"
@@ -61,6 +62,7 @@
                         android:layout_height="wrap_content"
                         android:padding="16dip"
                         android:background="?android:attr/selectableItemBackground"
+                        android:contentDescription="@string/volume_media_mute"
                     />
 
                 <SeekBar android:id="@+id/media_volume_seekbar"
@@ -101,6 +103,7 @@
                             android:layout_height="wrap_content"
                             android:padding="16dip"
                             android:background="?android:attr/selectableItemBackground"
+                            android:contentDescription="@string/volume_ring_mute"
                         />
 
                     <SeekBar android:id="@+id/ringer_volume_seekbar"
@@ -143,6 +146,7 @@
                             android:layout_height="wrap_content"
                             android:padding="16dip"
                             android:background="?android:attr/selectableItemBackground"
+                            android:contentDescription="@string/volume_notification_mute"
                         />
 
                     <SeekBar android:id="@+id/notification_volume_seekbar"
@@ -178,7 +182,7 @@
                         android:layout_height="wrap_content"
                         android:padding="16dip"
                         android:background="?android:attr/selectableItemBackground"
-                    />
+                        android:contentDescription="@string/volume_alarm_mute" />
                 <SeekBar android:id="@+id/alarm_volume_seekbar"
                         android:layout_width="0dip"
                         android:layout_height="wrap_content"
diff --git a/res/layout/preference_header_switch_item.xml b/res/layout/preference_header_switch_item.xml
index 877ad7c36..29b4b8a4f 100644
--- a/res/layout/preference_header_switch_item.xml
+++ b/res/layout/preference_header_switch_item.xml
@@ -29,7 +29,8 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="6dip"
         android:layout_marginRight="6dip"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:contentDescription="@null" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml
index 51612cea9..76606468c 100644
--- a/res/layout/preference_icon.xml
+++ b/res/layout/preference_icon.xml
@@ -31,7 +31,8 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="6dip"
         android:layout_marginRight="6dip"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:contentDescription="@null" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
index 1d6b237a9..e6188dce1 100644
--- a/res/layout/preference_powergauge.xml
+++ b/res/layout/preference_powergauge.xml
@@ -27,7 +27,8 @@
         android:layout_width="48dip"
         android:layout_height="wrap_content"
         android:layout_marginRight="6dip"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:contentDescription="@null" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
@@ -65,7 +66,8 @@
             android:layout_width="match_parent"
             android:layout_marginTop="5dip"
             android:layout_below="@id/percent"
-            android:layout_gravity="center_vertical" />
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@null" />
 
         <TextView android:id="@+android:id/summary"
             android:layout_width="wrap_content"
diff --git a/res/layout/preference_settings_checkbox_widget.xml b/res/layout/preference_settings_checkbox_widget.xml
index a65e56fca..960661f3a 100644
--- a/res/layout/preference_settings_checkbox_widget.xml
+++ b/res/layout/preference_settings_checkbox_widget.xml
@@ -36,7 +36,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/nav_divider" />
+        android:src="@drawable/nav_divider"
+        android:contentDescription="@null" />
 
     <!-- CheckBox -->
     <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout/preference_spellchecker.xml b/res/layout/preference_spellchecker.xml
index 9303670d6..f64c26c6f 100644
--- a/res/layout/preference_spellchecker.xml
+++ b/res/layout/preference_spellchecker.xml
@@ -70,7 +70,8 @@
         android:gravity="center_vertical"
         android:clickable="true"
         android:focusable="true"
-        android:background="?android:attr/selectableItemBackground" >
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@string/spellchecker_quick_settings" >
         <View
             android:layout_width="2dip"
             android:layout_height="match_parent"
@@ -83,7 +84,8 @@
             android:paddingLeft="5dip"
             android:paddingRight="5dip"
             android:src="@drawable/ic_sysbar_quicksettings"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"
+            android:contentDescription="@string/spellchecker_quick_settings" />
     </LinearLayout>
     <View
         android:id="@+id/pref_right_separator2"
@@ -102,5 +104,6 @@
         android:layout_gravity="right"
         android:clickable="true"
         android:focusable="true"
-        android:background="?android:attr/selectableItemBackground" />
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@string/spellchecker_language" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 5057aab54..7cb2997ec 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -27,14 +27,16 @@
         android:src="@drawable/ic_sync_error_holo"
         android:layout_width="wrap_content"
         android:layout_marginRight="8dip"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/sync_failed" />
 
     <com.android.settings.widget.AnimatedImageView
         android:id="@+id/sync_active"
         android:src="@drawable/ic_list_sync_anim"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="8dip" />
+        android:layout_marginRight="8dip"
+        android:contentDescription="@string/sync_active" />
 
     <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/checkbox"
diff --git a/res/layout/preference_widget_wifi_signal.xml b/res/layout/preference_widget_wifi_signal.xml
index a4e87630b..6df203c3a 100644
--- a/res/layout/preference_widget_wifi_signal.xml
+++ b/res/layout/preference_widget_wifi_signal.xml
@@ -18,4 +18,5 @@
     android:id="@+id/signal" 
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:src="@drawable/wifi_signal" />
+    android:src="@drawable/wifi_signal"
+    android:contentDescription="@null" />
diff --git a/res/layout/profile_icon_small.xml b/res/layout/profile_icon_small.xml
index 3a113e03c..9967f77d2 100644
--- a/res/layout/profile_icon_small.xml
+++ b/res/layout/profile_icon_small.xml
@@ -20,4 +20,5 @@
         android:layout_height="30dp"
         android:layout_marginRight="4dip"
         android:gravity="center"
-        android:layout_gravity="center_vertical" />
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@null" />
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index dacee9e5e..f46527af2 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -38,7 +38,8 @@
             android:layout_height="@android:dimen/app_icon_size"
             android:layout_marginRight="11dip"
             android:layout_gravity="center_vertical"
-            android:scaleType="fitCenter"/>
+            android:scaleType="fitCenter"
+            android:contentDescription="@null" />
     
         <LinearLayout
             android:orientation="vertical"
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 93eb9dfb2..f90daa43f 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -52,7 +52,8 @@
                 android:layout_marginLeft="8dip"
                 android:layout_marginBottom="8dip"
                 android:src="@drawable/ic_menu_add"
-                android:background="?android:attr/actionBarItemBackground" />
+                android:background="?android:attr/actionBarItemBackground"
+                android:contentDescription="@string/wifi_add_network" />
 
             <ImageButton
                 android:id="@+id/wps_push"
@@ -62,7 +63,8 @@
                 android:layout_marginRight="8dip"
                 android:layout_marginBottom="8dip"
                 android:src="@drawable/ic_wps"
-                android:background="?android:attr/actionBarItemBackground" />
+                android:background="?android:attr/actionBarItemBackground"
+                android:contentDescription="@string/wifi_menu_wps_pbc" />
 
         </LinearLayout>
 
diff --git a/res/layout/title.xml b/res/layout/title.xml
index 63a30a7f0..eb2222bcf 100644
--- a/res/layout/title.xml
+++ b/res/layout/title.xml
@@ -27,7 +27,8 @@
         android:layout_width="48dip"
         android:layout_height="48dip"
         android:layout_margin="5dip"
-        android:layout_gravity="center_vertical" />
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@null" />
 
     <LinearLayout
         android:layout_width="0dip"
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index fa8f3de07..d000a463d 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -38,6 +38,7 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:scaleType="center"
+            android:contentDescription="@null"
             />
 
         <ImageView
@@ -45,6 +46,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
+            android:contentDescription="@null"
             />
         </LinearLayout>
 
@@ -52,6 +54,7 @@
         android:layout_width="1dip"
         android:layout_height="match_parent"
         android:background="@drawable/appwidget_settings_divider_holo"
+        android:contentDescription="@null"
         />
 
     <LinearLayout
@@ -71,6 +74,7 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:scaleType="center"
+            android:contentDescription="@null"
             />
 
         <ImageView
@@ -78,6 +82,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
+            android:contentDescription="@null"
             />
 
     </LinearLayout>
@@ -86,6 +91,7 @@
         android:layout_width="1dip"
         android:layout_height="match_parent"
         android:background="@drawable/appwidget_settings_divider_holo"
+        android:contentDescription="@null"
         />
 
     <LinearLayout
@@ -105,6 +111,7 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:scaleType="center"
+            android:contentDescription="@null"
             />
 
         <ImageView
@@ -112,6 +119,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
+            android:contentDescription="@null"
             />
     </LinearLayout>
 
@@ -119,6 +127,7 @@
         android:layout_width="1dip"
         android:layout_height="match_parent"
         android:background="@drawable/appwidget_settings_divider_holo"
+        android:contentDescription="@null"
         />    
 
     <LinearLayout
@@ -138,6 +147,7 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:scaleType="center"
+            android:contentDescription="@null"
             />
 
         <ImageView
@@ -145,6 +155,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
+            android:contentDescription="@null"
             />
     </LinearLayout>
 
@@ -152,6 +163,7 @@
         android:layout_width="1dip"
         android:layout_height="match_parent"
         android:background="@drawable/appwidget_settings_divider_holo"
+        android:contentDescription="@null"
         />
 
     <LinearLayout
@@ -171,6 +183,7 @@
             android:layout_height="0dip"
             android:layout_weight="1"
             android:scaleType="center"
+            android:contentDescription="@null"
             />
 
         <ImageView
@@ -178,6 +191,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
+            android:contentDescription="@null"
             />
     </LinearLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 543c659e3..bad006e9d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -234,6 +234,10 @@
     <string name="bluetooth_devices">Bluetooth devices</string>
     <!-- Bluetooth settings screen, title for the current bluetooth name setting -->
     <string name="bluetooth_device_name">Device name</string>
+    <!-- Bluetooth settings screen, image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+    <string name="bluetooth_device_details">Device settings</string>
+    <!-- Bluetooth settings screen, image description for profile of a device details button. -->
+    <string name="bluetooth_profile_details">Profile settings</string>
     <!-- Bluetooth settings screen, summary text when there isn't a name set (for the name setting) -->
     <string name="bluetooth_name_not_set">No name set, using account name</string>
     <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
@@ -769,6 +773,9 @@
       to restore any data that was backed up to your Google Account.
     </string>
 
+    <!-- Image button description to switch input method -->
+    <string name="crypt_keeper_switch_input_method">Switch input method</string>
+
     <!-- Unlock Picker Settings --><skip />
 
     <!-- Security Picker --><skip />
@@ -1585,6 +1592,14 @@
     <string name="volume_notification_description">Notifications</string>
     <!-- Volume description for alarm volume -->
     <string name="volume_alarm_description">Alarms</string>
+    <!-- Image description for ringer volume mute button. -->
+    <string name="volume_ring_mute">Mute ringtone &amp; notifications</string>
+    <!-- Image description for media volume mute button. -->
+    <string name="volume_media_mute">Mute music &amp; other media</string>
+    <!-- Image description for notification volume mute button. -->
+    <string name="volume_notification_mute">Mute notifications</string>
+    <!-- Image description for alarm volume mute button. -->
+    <string name="volume_alarm_mute">Mute alarms</string>
     <!-- Sound settings screen, setting option name checkbox. About vibration setting
          during incoming calls. [CHAR LIMIT=30] -->
     <string name="vibrate_when_ringing_title">Vibrate when ringing</string>
@@ -2644,6 +2659,10 @@
     card numbers.  It comes from the app
     <xliff:g id="spellchecker_application_name">%1$s</xliff:g>.
     Use this spell checker?</string>
+    <!-- Image button description for spell checker quick settings. -->
+    <string name="spellchecker_quick_settings">Settings</string>
+    <!-- Image button description for spell checker language. -->
+    <string name="spellchecker_language">Language</string>
     <!-- Toast that settings for an application is failed to open. -->
     <string name="failed_to_open_app_settings_toast">Failed to open settings for <xliff:g id="spell_application_name">%1$s</xliff:g></string>
 
@@ -3479,6 +3498,10 @@
     <string name="accessibility_sync_disabled">Sync disabled</string>
     <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
     <string name="accessibility_sync_error">Sync error.</string>
+    <!-- Image description for the sync failed icon. -->
+    <string name="sync_failed">Sync failed</string>
+    <!-- Animation description for the sync active icon. -->
+    <string name="sync_active">Sync active</string>
 
     <!-- Account specific sync settings title [CHAR LIMIT=35] -->
     <string name="account_sync_settings_title">Sync settings</string>