From 45eb7fb118fdcc36495b9fe25ad71d48d324cf71 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 22 Dec 2019 20:17:45 +0100
Subject: [PATCH] Set seen/unseen content description on item view

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 6 +++---
 app/src/main/res/layout/include_message_compact.xml     | 1 +
 app/src/main/res/layout/include_message_normal.xml      | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f347ce598f..083f72a1df 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -721,6 +721,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             : message.uid == null && message.accountProtocol == EntityAccount.TYPE_IMAP)
                             ? Helper.LOW_LIGHT : 1.0f);
 
+            view.setContentDescription(context.getString(
+                    message.unseen > 0 ? R.string.title_accessibility_unseen : R.string.title_accessibility_seen));
+
             // Duplicate
             if (viewType == ViewType.THREAD) {
                 boolean dim = (message.duplicate || EntityFolder.TRASH.equals(message.folderType));
@@ -777,9 +780,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 vwColor.setBackgroundColor(colorBackground);
             }
 
-            vwColor.setContentDescription(context.getString(
-                    message.unseen > 0 ? R.string.title_accessibility_unseen : R.string.title_accessibility_seen));
-
             // Expander
             if (ibExpander.getTag() == null || (boolean) ibExpander.getTag() != expanded) {
                 ibExpander.setTag(expanded);
diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index 160783788c..e1f73f2875 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -9,6 +9,7 @@
         android:layout_width="6dp"
         android:layout_height="0dp"
         android:background="?attr/colorAccent"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index f1565d28df..ea6462d0c0 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -8,6 +8,7 @@
         android:layout_width="6dp"
         android:layout_height="0dp"
         android:background="?attr/colorAccent"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />