From c524c0503d7cb3c31026c76b6ed029a4cdd7fb43 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sat, 25 Feb 2012 22:13:17 -0600
Subject: [PATCH] Add content description to cover art

---
 res/layout-land/four_long_widget.xml | 3 ++-
 res/layout-v11/notification.xml      | 6 ++++--
 res/layout/actionbar_controls.xml    | 3 ++-
 res/layout/four_long_widget.xml      | 3 ++-
 res/layout/four_square_widget.xml    | 3 ++-
 res/layout/library_controls.xml      | 3 ++-
 res/layout/notification.xml          | 3 ++-
 res/layout/one_cell_widget.xml       | 3 ++-
 res/layout/widget_d.xml              | 3 ++-
 res/values/translatable.xml          | 2 ++
 10 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/res/layout-land/four_long_widget.xml b/res/layout-land/four_long_widget.xml
index 2d607792..a784cc35 100644
--- a/res/layout-land/four_long_widget.xml
+++ b/res/layout-land/four_long_widget.xml
@@ -31,7 +31,8 @@ THE SOFTWARE.
 		android:layout_height="fill_parent"
 		android:adjustViewBounds="true"
 		android:padding="5dip"
-		android:scaleType="fitCenter" />
+		android:scaleType="fitCenter"
+		android:contentDescription="@string/cover_art" />
 	<LinearLayout
 		android:id="@+id/text"
 		android:layout_width="0px"
diff --git a/res/layout-v11/notification.xml b/res/layout-v11/notification.xml
index 351144c0..f5bca63c 100644
--- a/res/layout-v11/notification.xml
+++ b/res/layout-v11/notification.xml
@@ -32,7 +32,8 @@ THE SOFTWARE.
 		android:adjustViewBounds="true"
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
-		android:layout_marginRight="5dip" />
+		android:layout_marginRight="5dip"
+		android:contentDescription="@string/cover_art" />
 	<LinearLayout
 		android:layout_width="0px"
 		android:layout_height="wrap_content"
@@ -84,5 +85,6 @@ THE SOFTWARE.
 		android:layout_gravity="center"
 		android:background="?android:attr/selectableItemBackground"
 		android:scaleType="fitCenter"
-		android:src="@drawable/notification_close" />
+		android:src="@drawable/notification_close"
+		android:contentDescription="@string/close_notification" />
 </LinearLayout>
diff --git a/res/layout/actionbar_controls.xml b/res/layout/actionbar_controls.xml
index 12feb00f..dda4892d 100644
--- a/res/layout/actionbar_controls.xml
+++ b/res/layout/actionbar_controls.xml
@@ -30,7 +30,8 @@ THE SOFTWARE.
 		android:layout_marginLeft="5dip"
 		android:layout_width="36dip"
 		android:layout_height="36dip"
-		android:layout_gravity="center" />
+		android:layout_gravity="center"
+		android:contentDescription="@string/cover_art" />
 	<LinearLayout
 		android:layout_height="wrap_content"
 		android:layout_width="fill_parent"
diff --git a/res/layout/four_long_widget.xml b/res/layout/four_long_widget.xml
index 0c02a228..2699ae6e 100644
--- a/res/layout/four_long_widget.xml
+++ b/res/layout/four_long_widget.xml
@@ -31,7 +31,8 @@ THE SOFTWARE.
 		android:layout_height="fill_parent"
 		android:adjustViewBounds="true"
 		android:padding="5dip"
-		android:scaleType="fitCenter" />
+		android:scaleType="fitCenter"
+		android:contentDescription="@string/cover_art" />
 	<LinearLayout
 		android:id="@+id/text"
 		android:layout_width="0px"
diff --git a/res/layout/four_square_widget.xml b/res/layout/four_square_widget.xml
index f6539cba..2ad9f5fa 100644
--- a/res/layout/four_square_widget.xml
+++ b/res/layout/four_square_widget.xml
@@ -29,7 +29,8 @@ THE SOFTWARE.
 		android:src="@drawable/fallback_cover"
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
-		android:scaleType="fitCenter" />
+		android:scaleType="fitCenter"
+		android:contentDescription="@string/cover_art" />
 	<LinearLayout
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
diff --git a/res/layout/library_controls.xml b/res/layout/library_controls.xml
index 8919fcaa..96b5cee9 100644
--- a/res/layout/library_controls.xml
+++ b/res/layout/library_controls.xml
@@ -38,7 +38,8 @@ THE SOFTWARE.
 		android:scaleType="fitCenter"
 		android:layout_width="80dip"
 		android:layout_height="fill_parent"
-		android:layout_gravity="center" />
+		android:layout_gravity="center"
+		android:contentDescription="@string/cover_art" />
 	<LinearLayout
 		android:layout_height="fill_parent"
 		android:layout_width="fill_parent"
diff --git a/res/layout/notification.xml b/res/layout/notification.xml
index 5af9e558..8e26041d 100644
--- a/res/layout/notification.xml
+++ b/res/layout/notification.xml
@@ -32,7 +32,8 @@ THE SOFTWARE.
 		android:adjustViewBounds="true"
 		android:layout_width="wrap_content"
 		android:layout_height="fill_parent"
-		android:layout_marginRight="5dip" />
+		android:layout_marginRight="5dip"
+		android:contentDescription="@string/cover_art" />
 	<LinearLayout
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
diff --git a/res/layout/one_cell_widget.xml b/res/layout/one_cell_widget.xml
index 1fe4c8bd..ea8791f8 100644
--- a/res/layout/one_cell_widget.xml
+++ b/res/layout/one_cell_widget.xml
@@ -29,7 +29,8 @@ THE SOFTWARE.
 		android:src="@drawable/fallback_cover"
 		android:layout_centerInParent="true"
 		android:layout_height="wrap_content"
-		android:layout_width="wrap_content" />
+		android:layout_width="wrap_content"
+		android:contentDescription="@string/cover_art" />
 	<TextView
 		android:id="@+id/title"
 		android:text="@string/app_name"
diff --git a/res/layout/widget_d.xml b/res/layout/widget_d.xml
index 576b1763..c19b90d0 100644
--- a/res/layout/widget_d.xml
+++ b/res/layout/widget_d.xml
@@ -29,6 +29,7 @@ THE SOFTWARE.
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
 		android:adjustViewBounds="true"
-		android:scaleType="fitCenter" />
+		android:scaleType="fitCenter"
+		android:contentDescription="@string/cover_art" />
 	<include layout="@layout/widget_e" />
 </FrameLayout>
diff --git a/res/values/translatable.xml b/res/values/translatable.xml
index 68f5cb1f..763c99ee 100644
--- a/res/values/translatable.xml
+++ b/res/values/translatable.xml
@@ -39,6 +39,8 @@ THE SOFTWARE.
 	<string name="random_enabling">Random enabled</string>
 	<string name="song_load_failed">Failed to load song %s. It may be corrupt or missing.</string>
 	<string name="queue_cleared">Queue cleared.</string>
+	<string name="cover_art">Cover art</string>
+	<string name="close_notification">Close notification</string>
 
 	<!-- New Playlist Dialog -->
 	<string name="choose_playlist_name">Choose Playlist Name</string>