From fd911e4274e2ec5b8cd0975398171425315aec31 Mon Sep 17 00:00:00 2001
From: danijoo <danijob88@googlemail.com>
Date: Sat, 9 Jan 2016 12:47:53 +0100
Subject: [PATCH] more content descriptors

---
 .../SpinnerIconAdapter.java                   |  2 ++
 .../NotificationListAdapter.java              |  1 +
 .../preferences/AppsAdapter.java              |  5 ++++-
 .../res/layout/spinner_item_with_icon.xml     | 12 -----------
 app/src/main/res/values/strings.xml           | 21 +++++++++++--------
 5 files changed, 19 insertions(+), 22 deletions(-)
 delete mode 100644 app/src/main/res/layout/spinner_item_with_icon.xml

diff --git a/app/src/main/java/net/headlezz/notificationlogger/createnotification/SpinnerIconAdapter.java b/app/src/main/java/net/headlezz/notificationlogger/createnotification/SpinnerIconAdapter.java
index 175f447..c7c7548 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/createnotification/SpinnerIconAdapter.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/createnotification/SpinnerIconAdapter.java
@@ -38,6 +38,7 @@ public class SpinnerIconAdapter extends ArrayAdapter<CharSequence> {
         ImageView iconView = (ImageView) convertView.findViewById(R.id.spinner_icon);
         Drawable icon = getContext().getResources().getDrawable(itemIcons[position]);
         iconView.setImageDrawable(icon);
+        iconView.setContentDescription(convertView.getContext().getString(R.string.create_icon_content_description, getItem(position)));
         return convertView;
     }
 
@@ -51,6 +52,7 @@ public class SpinnerIconAdapter extends ArrayAdapter<CharSequence> {
         ImageView iconView = (ImageView) convertView.findViewById(R.id.spinner_icon);
         Drawable icon = getContext().getResources().getDrawable(itemIcons[position]);
         iconView.setImageDrawable(icon);
+        iconView.setContentDescription(convertView.getContext().getString(R.string.create_icon_content_description, getItem(position)));
         return convertView;
     }
 
diff --git a/app/src/main/java/net/headlezz/notificationlogger/notificationlist/NotificationListAdapter.java b/app/src/main/java/net/headlezz/notificationlogger/notificationlist/NotificationListAdapter.java
index eddfb21..49503d4 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/notificationlist/NotificationListAdapter.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/notificationlist/NotificationListAdapter.java
@@ -73,6 +73,7 @@ public class NotificationListAdapter extends CursorRecyclerViewAdapter<Notificat
 
 
             ivSmallIcon.setImageDrawable(smallIcon);
+            ivSmallIcon.setContentDescription(context.getString(R.string.notification_list_item_small_icon_content_description, n.appName));
 
             itemView.setTag(n.id);
         }
diff --git a/app/src/main/java/net/headlezz/notificationlogger/preferences/AppsAdapter.java b/app/src/main/java/net/headlezz/notificationlogger/preferences/AppsAdapter.java
index 450f111..fe69d6d 100644
--- a/app/src/main/java/net/headlezz/notificationlogger/preferences/AppsAdapter.java
+++ b/app/src/main/java/net/headlezz/notificationlogger/preferences/AppsAdapter.java
@@ -60,12 +60,15 @@ public class AppsAdapter extends BaseAdapter {
         String packageName = (String) getItem(position);
         viewHolder.tvPackageName.setText(packageName);
         try {
-            viewHolder.tvName.setText(PackageUtils.getAppName(convertView.getContext(), packageName));
+            String appName = PackageUtils.getAppName(convertView.getContext(), packageName);
+            viewHolder.tvName.setText(appName);
             viewHolder.ivIcon.setImageDrawable(PackageUtils.getApplicationLauncherIcon(convertView.getContext(), packageName));
+            viewHolder.ivIcon.setContentDescription(convertView.getContext().getString(R.string.app_icon_cd, appName));
         } catch (PackageManager.NameNotFoundException e) {
             Timber.d("app name not found", e);
             viewHolder.tvName.setText("");
             viewHolder.ivIcon.setImageDrawable(null);
+            viewHolder.ivIcon.setContentDescription("");
         }
 
         return convertView;
diff --git a/app/src/main/res/layout/spinner_item_with_icon.xml b/app/src/main/res/layout/spinner_item_with_icon.xml
deleted file mode 100644
index 28ca0f6..0000000
--- a/app/src/main/res/layout/spinner_item_with_icon.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <include layout="@android:layout/simple_spinner_item" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e9b25b7..41fcea4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,6 +53,7 @@
     <string name="create_shedule_snack">Notification sheduled for %1$s</string>
     <string name="create_shedule_snack_undo">Undo</string>
     <string name="notification_list_empty">No notifications found.</string>
+    <string name="notification_list_item_small_icon_content_description">Small notification icon: %s</string>
     <string name="notification_small_icon_cd">Notification small icon</string>
     <string name="app_icon_cd">Application icon for %s</string>
     <string name="notification_info_dialog_app_info_error">Failed to display app info.</string>
@@ -111,14 +112,16 @@
         <item>Transport</item>
     </string-array>
 
+    <string name="create_icon_content_description">Notification icon: %s</string>
     <string-array name="create_icons">
-        <item>ADB</item>
-        <item>Bluetooth</item>
-        <item>Car</item>
-        <item>Event</item>
-        <item>Video</item>
-        <item>Power</item>
-        <item>SD card</item>
-        <item>SMS</item>
-    </string-array>
+    <item>ADB</item>
+    <item>Bluetooth</item>
+    <item>Car</item>
+    <item>Event</item>
+    <item>Video</item>
+    <item>Power</item>
+    <item>SD card</item>
+    <item>SMS</item>
+</string-array>
+    <string-array name="create_icons_content_descriptions" />
 </resources>