From 153a82962eacadb6cc1ea1290b14b107cc0d316c Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Tue, 24 Jul 2018 13:54:01 +0200
Subject: [PATCH 1/8] drawer menu button now reads out "Open"->"Open sidebar"
 and "Close"->"Close sidebar"

---
 src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3c4ffeab35..1b5df9d0b8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -34,8 +34,8 @@
     <string name="drawer_item_activities">Activities</string>
     <string name="drawer_item_notifications">Notifications</string>
     <string name="drawer_quota">%1$s of %2$s used</string>
-	<string name="drawer_close">Close</string>
-    <string name="drawer_open">Open</string>
+	<string name="drawer_close">Close sidebar</string>
+    <string name="drawer_open">Open sidebar</string>
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
     <string name="prefs_manage_accounts">Manage accounts</string>

From 270a93d8d428a9b6419541ac00ceb132f0e9ec43 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Tue, 24 Jul 2018 14:09:12 +0200
Subject: [PATCH 2/8] talkback: "thumbnail" isn't spoken anymore

---
 src/main/res/layout/grid_image.xml                | 3 ++-
 src/main/res/layout/grid_item.xml                 | 2 +-
 src/main/res/layout/list_item.xml                 | 2 +-
 src/main/res/layout/trashbin_item.xml             | 2 +-
 src/main/res/layout/upload_list_item.xml          | 2 +-
 src/main/res/layout/uploader_list_item_layout.xml | 2 +-
 src/main/res/layout/version_list_item.xml         | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/res/layout/grid_image.xml b/src/main/res/layout/grid_image.xml
index 2768cb67a5..847e76181b 100644
--- a/src/main/res/layout/grid_image.xml
+++ b/src/main/res/layout/grid_image.xml
@@ -35,7 +35,8 @@
             android:layout_height="match_parent"
             android:padding="@dimen/standard_eigth_padding"
             android:scaleType="centerCrop"
-            android:src="@drawable/folder" />
+            android:src="@drawable/folder"
+            android:contentDescription="@null"/>
 
 
         <ImageView
diff --git a/src/main/res/layout/grid_item.xml b/src/main/res/layout/grid_item.xml
index d3f9bfa28d..3fc947af69 100644
--- a/src/main/res/layout/grid_item.xml
+++ b/src/main/res/layout/grid_item.xml
@@ -35,7 +35,7 @@
             android:layout_height="@dimen/standard_list_item_size"
             android:layout_gravity="center"
             android:src="@drawable/folder"
-            android:contentDescription="@string/thumbnail"/>
+            android:contentDescription="@null"/>
 
         <ImageView
             android:id="@+id/favorite_action"
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 9ffb3ae3a1..d1c8b7d24c 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -49,7 +49,7 @@
                 android:layout_centerInParent="true"
                 android:layout_marginLeft="@dimen/standard_half_margin"
                 android:layout_marginStart="@dimen/standard_half_margin"
-                android:contentDescription="@string/thumbnail"
+                android:contentDescription="@null"
                 android:src="@drawable/folder" />
 
             <ImageView
diff --git a/src/main/res/layout/trashbin_item.xml b/src/main/res/layout/trashbin_item.xml
index 8b9953d51e..13e6e35fa9 100644
--- a/src/main/res/layout/trashbin_item.xml
+++ b/src/main/res/layout/trashbin_item.xml
@@ -38,7 +38,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/standard_margin"
             android:layout_marginRight="@dimen/standard_margin"
-            android:contentDescription="@string/thumbnail"
+            android:contentDescription="@null"
             android:src="@drawable/folder"/>
 
         <LinearLayout
diff --git a/src/main/res/layout/upload_list_item.xml b/src/main/res/layout/upload_list_item.xml
index c94e8aff2c..411cd9bd56 100755
--- a/src/main/res/layout/upload_list_item.xml
+++ b/src/main/res/layout/upload_list_item.xml
@@ -40,7 +40,7 @@
             android:layout_width="@dimen/file_icon_size"
             android:layout_height="@dimen/file_icon_size"
             android:layout_gravity="center"
-            android:contentDescription="@string/thumbnail"
+            android:contentDescription="@null"
             android:src="@drawable/folder" />
 
     </FrameLayout>
diff --git a/src/main/res/layout/uploader_list_item_layout.xml b/src/main/res/layout/uploader_list_item_layout.xml
index 53b9d019c5..b1b7ddbeb4 100644
--- a/src/main/res/layout/uploader_list_item_layout.xml
+++ b/src/main/res/layout/uploader_list_item_layout.xml
@@ -30,7 +30,7 @@
         android:layout_gravity="center_vertical"
         android:layout_margin="@dimen/uploader_list_item_layout_image_margin"
         android:src="@drawable/folder"
-        android:contentDescription="@string/thumbnail"/>
+        android:contentDescription="@null"/>
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/src/main/res/layout/version_list_item.xml b/src/main/res/layout/version_list_item.xml
index df93d25bc3..5db4448f80 100644
--- a/src/main/res/layout/version_list_item.xml
+++ b/src/main/res/layout/version_list_item.xml
@@ -38,7 +38,7 @@
         android:layout_marginEnd="@dimen/activity_icon_layout_right_end_margin"
         android:layout_marginRight="@dimen/activity_icon_layout_right_end_margin"
         android:alpha="0.5"
-        android:contentDescription="@string/thumbnail"
+        android:contentDescription="@null"
         android:src="@drawable/ic_activity"/>
 
     <LinearLayout

From e3b9b9c7aaa65617f3b6de86935492150af5d544 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Tue, 24 Jul 2018 14:53:38 +0200
Subject: [PATCH 3/8] talkback: The "+" menu FAB should be spoken as "Add or
 upload"

---
 src/main/res/layout/list_fragment.xml | 1 +
 src/main/res/values/strings.xml       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/main/res/layout/list_fragment.xml b/src/main/res/layout/list_fragment.xml
index 2d1afe1d0d..1712df951f 100644
--- a/src/main/res/layout/list_fragment.xml
+++ b/src/main/res/layout/list_fragment.xml
@@ -56,6 +56,7 @@
         android:layout_marginBottom="@dimen/standard_margin"
         android:layout_marginEnd="@dimen/standard_margin"
         android:layout_marginRight="@dimen/standard_margin"
+        android:contentDescription="@string/fab_label"
         android:visibility="gone" />
 
     <android.support.design.widget.BottomNavigationView
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 1b5df9d0b8..e902bdb942 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -827,4 +827,5 @@
     <string name="stream_not_possible_message">Please download media instead or use external app.</string>
     <string name="folder_already_exists">Folder already exists</string>
     <string name="notification_icon">Notification icon</string>
+    <string name="fab_label">Add or upload</string>
 </resources>

From c370bf3089e3d134d02232a8135fefb8cd646377 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Tue, 24 Jul 2018 15:05:42 +0200
Subject: [PATCH 4/8] talkback: mute thumbnail for share screen

---
 src/main/res/layout/share_file_layout.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/layout/share_file_layout.xml b/src/main/res/layout/share_file_layout.xml
index c4ac306a6a..8576770b42 100644
--- a/src/main/res/layout/share_file_layout.xml
+++ b/src/main/res/layout/share_file_layout.xml
@@ -42,7 +42,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="@dimen/standard_half_margin"
                 android:layout_marginEnd="@dimen/standard_half_margin"
-                android:contentDescription="@string/share_file_icon"
+                android:contentDescription="@null"
                 android:src="@drawable/file"/>
 
             <TextView

From 4ba0c66f822295c89a7813223502be955fd77b42 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Tue, 24 Jul 2018 15:06:23 +0200
Subject: [PATCH 5/8] talkback: remove "icon" text from content description,
 implement proper content description for share state

---
 .../android/ui/adapter/OCFileListAdapter.java   |  3 +++
 src/main/res/layout/grid_image.xml              |  2 +-
 src/main/res/layout/grid_item.xml               |  2 +-
 src/main/res/layout/list_item.xml               |  2 +-
 src/main/res/values/strings.xml                 | 17 +++++++++--------
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
index 3294e67f8c..b2a19c5fd9 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -472,10 +472,13 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         
         if (file.isSharedWithSharee() || file.isSharedWithMe()) {
             sharedIconView.setImageResource(R.drawable.shared_via_users);
+            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_share));
         } else if (file.isSharedViaLink()) {
             sharedIconView.setImageResource(R.drawable.shared_via_link);
+            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_shared_via_link));
         } else {
             sharedIconView.setImageResource(R.drawable.ic_unshared);
+            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_share));
         }
         sharedIconView.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/src/main/res/layout/grid_image.xml b/src/main/res/layout/grid_image.xml
index 847e76181b..545bccd683 100644
--- a/src/main/res/layout/grid_image.xml
+++ b/src/main/res/layout/grid_image.xml
@@ -56,7 +56,7 @@
             android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginTop="@dimen/grid_image_shared_icon_layout_top_margin"
-            android:contentDescription="@string/shared_via_link_icon"
+            android:contentDescription="@string/shared_icon_shared_via_link"
             android:src="@drawable/shared_via_link" />
 
         <ImageView
diff --git a/src/main/res/layout/grid_item.xml b/src/main/res/layout/grid_item.xml
index 3fc947af69..29f8afc9fb 100644
--- a/src/main/res/layout/grid_item.xml
+++ b/src/main/res/layout/grid_item.xml
@@ -55,7 +55,7 @@
             android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:src="@drawable/shared_via_link"
-            android:contentDescription="@string/shared_via_link_icon"/>
+            android:contentDescription="@string/shared_icon_shared_via_link"/>
 
         <ImageView
             android:id="@+id/localFileIndicator"
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index d1c8b7d24c..c7913c6123 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -164,7 +164,7 @@
                 android:layout_height="match_parent"
                 android:layout_centerVertical="true"
                 android:clickable="true"
-                android:contentDescription="@string/shared_icon"
+                android:contentDescription="@string/shared_icon_share"
                 android:focusable="true"
                 android:paddingEnd="@dimen/list_item_share_right_margin"
                 android:paddingLeft="@dimen/standard_half_padding"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e902bdb942..ad0388769b 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -694,16 +694,17 @@
     <string name="drawer_middle_account">Middle account</string>
     <string name="drawer_end_account">Last account</string>
     <string name="contactlist_item_icon">User icon for contact list</string>
-    <string name="activity_icon">Activity icon</string>
-    <string name="file_icon">File icon</string>
-    <string name="user_icon">User icon</string>
-    <string name="favorite_icon">Favorite icon</string>
-    <string name="shared_via_link_icon">Shared via link icon</string>
-    <string name="synced_icon">Synced icon</string>
-    <string name="available_offline_icon">Available offline icon</string>
+    <string name="activity_icon">Activity</string>
+    <string name="file_icon">File</string>
+    <string name="user_icon">User</string>
+    <string name="favorite_icon">Favorite</string>
+    <string name="synced_icon">Synced</string>
+    <string name="available_offline_icon">Available offline</string>
     <string name="checkbox">Checkbox</string>
     <string name="thumbnail">Thumbnail</string>
-    <string name="shared_icon">Shared icon</string>
+    <string name="shared_icon_share">share</string>
+    <string name="shared_icon_shared_via_link">shared via link</string>
+    <string name="shared_icon_shared">shared</string>
     <string name="overflow_menu">Overflow menu</string>
     <string name="share_file_icon">Share file icon</string>
     <string name="sort_by_name_ascending">A - Z</string>

From 105e8c756ae724d50d194eac0ed75025cc3c09ad Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Tue, 24 Jul 2018 15:12:21 +0200
Subject: [PATCH 6/8] remove unused strings

---
 src/main/res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ad0388769b..bd526747b0 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -701,12 +701,10 @@
     <string name="synced_icon">Synced</string>
     <string name="available_offline_icon">Available offline</string>
     <string name="checkbox">Checkbox</string>
-    <string name="thumbnail">Thumbnail</string>
     <string name="shared_icon_share">share</string>
     <string name="shared_icon_shared_via_link">shared via link</string>
     <string name="shared_icon_shared">shared</string>
     <string name="overflow_menu">Overflow menu</string>
-    <string name="share_file_icon">Share file icon</string>
     <string name="sort_by_name_ascending">A - Z</string>
     <string name="sort_by_modification_date_ascending">Newest first</string>
     <string name="sort_by_size_descending">Biggest first</string>

From 7faf5ee53e3f31ba70d2a47d11a822bbddfdd4b7 Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Tue, 24 Jul 2018 15:13:21 +0200
Subject: [PATCH 7/8] talkback: rename "Overflow menu"->"More menu"

---
 src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index bd526747b0..f2cdce0f71 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -704,7 +704,7 @@
     <string name="shared_icon_share">share</string>
     <string name="shared_icon_shared_via_link">shared via link</string>
     <string name="shared_icon_shared">shared</string>
-    <string name="overflow_menu">Overflow menu</string>
+    <string name="overflow_menu">More menu</string>
     <string name="sort_by_name_ascending">A - Z</string>
     <string name="sort_by_modification_date_ascending">Newest first</string>
     <string name="sort_by_size_descending">Biggest first</string>

From 92c38d0625ef380e4b4243d36952bb0947babfaa Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Tue, 24 Jul 2018 16:02:59 +0200
Subject: [PATCH 8/8] talkback: fix share status on share icon in file list

---
 .../java/com/owncloud/android/ui/adapter/OCFileListAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
index b2a19c5fd9..942f572c03 100644
--- a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
+++ b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -472,7 +472,7 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         
         if (file.isSharedWithSharee() || file.isSharedWithMe()) {
             sharedIconView.setImageResource(R.drawable.shared_via_users);
-            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_share));
+            sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_shared));
         } else if (file.isSharedViaLink()) {
             sharedIconView.setImageResource(R.drawable.shared_via_link);
             sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_shared_via_link));