From 05f7850a0188b3115981a72f2cf0d8dcf3a4f72b Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Mon, 5 Sep 2022 20:28:11 +0200
Subject: [PATCH 1/4] Adds space name to expand / collapse chevron content
 description in space bottom sheet

---
 library/ui-strings/src/main/res/values/strings.xml          | 6 ++++--
 .../im/vector/app/features/spaces/NewSpaceSummaryItem.kt    | 5 ++++-
 .../im/vector/app/features/spaces/NewSubSpaceSummaryItem.kt | 5 +++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 26f26dc7e5..1317ec3c65 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -140,8 +140,10 @@
     <string name="start_chat">Start Chat</string>
     <string name="create_room">Create Room</string>
     <string name="explore_rooms">Explore Rooms</string>
-    <string name="a11y_expand_space_children">Expand space children</string>
-    <string name="a11y_collapse_space_children">Collapse space children</string>
+    <!-- Note to translators: %s refers to the space whose children is being expanded -->
+    <string name="a11y_expand_space_children">Expand %s children</string>
+    <!-- Note to translators: %s refers to the space whose children is being collapsed -->
+    <string name="a11y_collapse_space_children">Collapse %s children</string>
 
     <!-- Last seen time -->
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
index e6e4aadb9c..d59de6ac99 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
@@ -58,7 +58,10 @@ abstract class NewSpaceSummaryItem : VectorEpoxyModel<NewSpaceSummaryItem.Holder
         holder.chevron.setOnClickListener(onToggleExpandListener)
         holder.chevron.isVisible = hasChildren
         holder.chevron.setImageResource(if (expanded) R.drawable.ic_expand_more else R.drawable.ic_arrow_right)
-        holder.chevron.contentDescription = context.getString(if (expanded) R.string.a11y_collapse_space_children else R.string.a11y_expand_space_children)
+        holder.chevron.contentDescription = context.getString(
+                if (expanded) R.string.a11y_collapse_space_children else R.string.a11y_expand_space_children,
+                matrixItem.displayName,
+        )
 
         avatarRenderer.render(matrixItem, holder.avatar)
         holder.unreadCounter.render(countState)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/NewSubSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/NewSubSpaceSummaryItem.kt
index fae600917c..638cc09474 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/NewSubSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/NewSubSpaceSummaryItem.kt
@@ -50,6 +50,7 @@ abstract class NewSubSpaceSummaryItem : VectorEpoxyModel<NewSubSpaceSummaryItem.
 
     override fun bind(holder: Holder) {
         super.bind(holder)
+        val context = holder.root.context
         holder.root.onClick(onSubSpaceSelectedListener)
         holder.name.text = matrixItem.displayName
         holder.root.isChecked = selected
@@ -63,6 +64,10 @@ abstract class NewSubSpaceSummaryItem : VectorEpoxyModel<NewSubSpaceSummaryItem.
         )
         holder.chevron.onClick(onToggleExpandListener)
         holder.chevron.isVisible = hasChildren
+        holder.chevron.contentDescription = context.getString(
+                if (expanded) R.string.a11y_collapse_space_children else R.string.a11y_expand_space_children,
+                matrixItem.displayName,
+        )
 
         holder.indent.isVisible = indent > 0
         holder.indent.updateLayoutParams {

From 93ce7f8db55fe05e7db134fcd9fbfceadfe8543e Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Mon, 5 Sep 2022 20:52:45 +0200
Subject: [PATCH 2/4] Fixes home screen talkback jumping to fabs too early

---
 vector/src/main/res/layout/fragment_new_home_detail.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/res/layout/fragment_new_home_detail.xml b/vector/src/main/res/layout/fragment_new_home_detail.xml
index 82bc6bb36e..150673b486 100644
--- a/vector/src/main/res/layout/fragment_new_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_new_home_detail.xml
@@ -127,7 +127,6 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:accessibilityTraversalBefore="@id/roomListView"
         android:contentDescription="@string/a11y_create_message"
         android:src="@drawable/ic_new_chat"
         android:visibility="gone"

From 289ed86be77450cf0372a76047643787f163871c Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Mon, 5 Sep 2022 20:53:03 +0200
Subject: [PATCH 3/4] Fixes recents carousel saying name twice in talkback

---
 vector/src/main/res/layout/item_recent_room.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/layout/item_recent_room.xml b/vector/src/main/res/layout/item_recent_room.xml
index 8e17707ff3..3e10d90e4e 100644
--- a/vector/src/main/res/layout/item_recent_room.xml
+++ b/vector/src/main/res/layout/item_recent_room.xml
@@ -50,6 +50,7 @@
         android:layout_marginTop="4dp"
         android:layout_marginBottom="16dp"
         android:ellipsize="end"
+        android:importantForAccessibility="no"
         android:lines="1"
         android:textColor="?vctr_content_primary"
         app:layout_constraintBottom_toBottomOf="parent"

From 14bce28c87a8d911b4ea100311d56113e0cabf3c Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Mon, 5 Sep 2022 21:17:59 +0200
Subject: [PATCH 4/4] Adds changelog file

---
 changelog.d/7016.wip | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/7016.wip

diff --git a/changelog.d/7016.wip b/changelog.d/7016.wip
new file mode 100644
index 0000000000..6918991a86
--- /dev/null
+++ b/changelog.d/7016.wip
@@ -0,0 +1 @@
+[New Layout] Improves talkback accessibility