Improved TalkBack accessibility

17 files changed, 37 insertions, 19 deletions

diff --git a/app/src/main/res/layout/about_teaser.xml b/app/src/main/res/layout/about_teaser.xml
index a9e50f6da..4e7f0454f 100644
--- a/app/src/main/res/layout/about_teaser.xml
+++ b/app/src/main/res/layout/about_teaser.xml
@@ -4,4 +4,6 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:adjustViewBounds="true"
-        android:layout_height="wrap_content" app:srcCompat="@drawable/teaser" />
\ No newline at end of file
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/teaser"
+        android:importantForAccessibility="no"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml
index a9e9137f2..f66c16582 100644
--- a/app/src/main/res/layout/audioplayer_fragment.xml
+++ b/app/src/main/res/layout/audioplayer_fragment.xml
@@ -22,6 +22,7 @@
             android:layout_marginTop="-12dp"
             android:padding="4dp"
             android:layout_below="@id/toolbar"
+            android:contentDescription="@string/switch_pages"
             android:layout_centerHorizontal="true"/>
 
     <FrameLayout
diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml
index 31e7dbda7..28321e760 100644
--- a/app/src/main/res/layout/cover_fragment.xml
+++ b/app/src/main/res/layout/cover_fragment.xml
@@ -13,13 +13,13 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:contentDescription="@string/cover_label"
         android:scaleType="fitCenter"
         android:layout_marginLeft="32dp"
         android:layout_marginRight="32dp"
         android:transitionName="coverTransition"
         tools:src="@android:drawable/sym_def_app_icon"
         android:foreground="?attr/selectableItemBackgroundBorderless"
+        android:importantForAccessibility="no"
         squareImageView:direction="minimum" />
 
     <TextView
diff --git a/app/src/main/res/layout/episodes_apply_action_fragment.xml b/app/src/main/res/layout/episodes_apply_action_fragment.xml
index 0baa2061a..304588e3e 100644
--- a/app/src/main/res/layout/episodes_apply_action_fragment.xml
+++ b/app/src/main/res/layout/episodes_apply_action_fragment.xml
@@ -24,6 +24,7 @@
         android:id="@+id/fabSDOverlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:importantForAccessibility="no"
         android:layout_below="@id/toolbar" />
     <!-- The FAB SpeedDial
          1. MUST be placed at the bottom of the layout xml to ensure it is at the front,
@@ -51,7 +52,8 @@
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginBottom="16dp"
-            />
+            android:accessibilityTraversalBefore="@android:id/list"
+            android:contentDescription="@string/apply_action" />
     </ScrollView>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml
index dd8f7fe40..43b777d99 100644
--- a/app/src/main/res/layout/external_player_fragment.xml
+++ b/app/src/main/res/layout/external_player_fragment.xml
@@ -22,7 +22,7 @@
 
         <ImageView
                 android:id="@+id/imgvCover"
-                android:contentDescription="@string/cover_label"
+                android:contentDescription="@string/media_player"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:adjustViewBounds="true"
diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml
index 8dfbbe562..72effc585 100644
--- a/app/src/main/res/layout/feeditem_fragment.xml
+++ b/app/src/main/res/layout/feeditem_fragment.xml
@@ -25,7 +25,7 @@
                 android:layout_width="@dimen/thumbnail_length_queue_item"
                 android:layout_height="@dimen/thumbnail_length_queue_item"
                 android:layout_gravity="center_vertical"
-                android:contentDescription="@string/cover_label"
+                android:contentDescription="@string/open_podcast"
                 android:foreground="?attr/selectableItemBackground"
                 tools:src="@tools:sample/avatars" />
 
@@ -42,6 +42,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:foreground="?attr/selectableItemBackground"
+                    android:importantForAccessibility="no"
                     tools:text="Podcast title"
                     tools:background="@android:color/holo_green_dark" />
 
@@ -77,6 +78,7 @@
                         android:layout_marginStart="4dp"
                         android:layout_marginRight="4dp"
                         android:layout_marginEnd="4dp"
+                        android:importantForAccessibility="no"
                         android:text="·"
                         tools:background="@android:color/holo_blue_light" />
 
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index 14ba6c3d0..e7421e758 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -21,11 +21,10 @@
                 android:layout_height="100dp"
                 android:layout_marginRight="16dp"
                 android:layout_marginEnd="16dp"
-                android:contentDescription="@string/cover_label"
+                android:importantForAccessibility="no"
                 tools:src="@drawable/ic_antenna"
                 tools:background="@android:color/holo_green_dark"/>
 
-
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml
index 5a7ba4754..90062bbf6 100644
--- a/app/src/main/res/layout/feeditemlist_item.xml
+++ b/app/src/main/res/layout/feeditemlist_item.xml
@@ -17,12 +17,13 @@
     <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:id="@+id/left_padding"
             android:minWidth="4dp">
         <ImageView
                 android:id="@+id/drag_handle"
                 android:layout_width="16dp"
                 android:layout_height="match_parent"
-                android:contentDescription="@string/drag_handle_content_description"
+                android:importantForAccessibility="no"
                 android:scaleType="fitCenter"
                 android:src="?attr/dragview_background"
                 android:paddingStart="0dp"
@@ -65,7 +66,7 @@
                     android:layout_width="@dimen/thumbnail_length_queue_item"
                     android:layout_height="@dimen/thumbnail_length_queue_item"
                     android:layout_centerVertical="true"
-                    android:contentDescription="@string/cover_label"
+                    android:importantForAccessibility="no"
                     tools:src="@tools:sample/avatars"/>
 
         </RelativeLayout>
@@ -104,6 +105,7 @@
                     android:layout_height="14sp"
                     app:srcCompat="?attr/type_video"
                     tools:srcCompat="@drawable/ic_videocam_black_24dp"
+                    android:contentDescription="@string/media_type_video_label"
                     android:id="@+id/ivIsVideo"/>
 
             <ImageView
@@ -111,6 +113,7 @@
                     android:layout_height="14sp"
                     app:srcCompat="?attr/ic_unfav"
                     tools:srcCompat="@drawable/ic_star_black"
+                    android:contentDescription="@string/is_favorite_label"
                     android:id="@+id/isFavorite"/>
 
             <ImageView
@@ -118,6 +121,7 @@
                     android:layout_height="14sp"
                     app:srcCompat="?attr/stat_playlist"
                     tools:srcCompat="@drawable/ic_playlist_black"
+                    android:contentDescription="@string/in_queue_label"
                     android:id="@+id/ivInPlaylist"/>
 
             <TextView
@@ -160,12 +164,19 @@
                     tools:text="10 MB"/>
 
         </LinearLayout>
+
+        <!--
+            Warning: android:contentDescription is set to an empty string.
+            The title is read as contentDescription of left_padding to have it read first.
+            Keep this in mind when changing the order of this layout!
+        -->
         <TextView
                 android:id="@+id/txtvTitle"
                 style="@style/AntennaPod.TextView.ListItemPrimaryTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:text="@sample/episodes.json/data/title"
+                android:importantForAccessibility="no"
                 android:ellipsize="end"
                 tools:background="@android:color/holo_blue_light"/>
 
diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
index 4e05f5599..9821f6e17 100644
--- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
@@ -20,7 +20,7 @@
             android:layout_marginRight="16dp"
             android:layout_marginEnd="16dp"
             android:adjustViewBounds="true"
-            android:contentDescription="@string/cover_label"
+            android:importantForAccessibility="no"
             android:cropToPadding="true"
             android:scaleType="fitXY"
             tools:src="@drawable/ic_antenna"
diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml
index 87d71720a..dcf2face6 100644
--- a/app/src/main/res/layout/itunes_podcast_listitem.xml
+++ b/app/src/main/res/layout/itunes_podcast_listitem.xml
@@ -19,7 +19,7 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:adjustViewBounds="true"
-        android:contentDescription="@string/cover_label"
+        android:importantForAccessibility="no"
         android:cropToPadding="true"
         android:scaleType="fitXY"
         tools:background="@android:color/holo_green_dark"
diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml
index 504952b08..c26d0b8ed 100644
--- a/app/src/main/res/layout/nav_list.xml
+++ b/app/src/main/res/layout/nav_list.xml
@@ -13,6 +13,7 @@
         android:layout_alignParentBottom="true"
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/settings_label"
+        android:accessibilityTraversalBefore="@id/nav_list"
         android:orientation="horizontal"
         android:focusable="true">
 
@@ -25,7 +26,7 @@
             android:layout_marginStart="@dimen/listitem_icon_leftpadding"
             android:layout_marginTop="4dp"
             android:adjustViewBounds="true"
-            android:contentDescription="@string/cover_label"
+            android:importantForAccessibility="no"
             android:cropToPadding="true"
             android:padding="8dp"
             android:scaleType="centerCrop"
diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml
index 2b7bc5715..3610ce56e 100644
--- a/app/src/main/res/layout/nav_listitem.xml
+++ b/app/src/main/res/layout/nav_listitem.xml
@@ -9,7 +9,7 @@
 
     <ImageView
         android:id="@+id/imgvCover"
-        android:contentDescription="@string/cover_label"
+        android:importantForAccessibility="no"
         android:layout_width="@dimen/thumbnail_length_navlist"
         android:layout_height="@dimen/thumbnail_length_navlist"
         android:layout_alignParentLeft="true"
diff --git a/app/src/main/res/layout/nav_section_item.xml b/app/src/main/res/layout/nav_section_item.xml
index fa1db865d..45d0dff59 100644
--- a/app/src/main/res/layout/nav_section_item.xml
+++ b/app/src/main/res/layout/nav_section_item.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="16dp"
     android:background="@android:color/transparent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:importantForAccessibility="no">
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/onlinefeedview_activity.xml b/app/src/main/res/layout/onlinefeedview_activity.xml
index 34dbeb6d9..cddb1048c 100644
--- a/app/src/main/res/layout/onlinefeedview_activity.xml
+++ b/app/src/main/res/layout/onlinefeedview_activity.xml
@@ -56,7 +56,7 @@
                             android:layout_marginLeft="16dp"
                             android:layout_marginStart="16dp"
                             android:layout_marginTop="16dp"
-                            android:contentDescription="@string/cover_label"
+                            android:importantForAccessibility="no"
                             tools:src="@drawable/ic_antenna"/>
 
                     <TextView
diff --git a/app/src/main/res/layout/searchlist_item.xml b/app/src/main/res/layout/searchlist_item.xml
index e8ff18c5f..608bfc3bc 100644
--- a/app/src/main/res/layout/searchlist_item.xml
+++ b/app/src/main/res/layout/searchlist_item.xml
@@ -16,7 +16,7 @@
         android:layout_centerVertical="true"
         android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding"
         android:layout_marginStart="@dimen/listitem_threeline_horizontalpadding"
-        android:contentDescription="@string/cover_label"
+        android:importantForAccessibility="no"
         android:scaleType="centerCrop"
         tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
diff --git a/app/src/main/res/layout/simplechapter_item.xml b/app/src/main/res/layout/simplechapter_item.xml
index 54c607d71..276ce48bc 100644
--- a/app/src/main/res/layout/simplechapter_item.xml
+++ b/app/src/main/res/layout/simplechapter_item.xml
@@ -14,7 +14,7 @@
         android:id="@+id/imgvCover"
         android:layout_width="@dimen/thumbnail_length_queue_item"
         android:layout_height="@dimen/thumbnail_length_queue_item"
-        android:contentDescription="@string/cover_label"
+        android:importantForAccessibility="no"
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
         tools:src="@tools:sample/avatars"/>
diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml
index aaa0f666c..0b2f464d4 100644
--- a/app/src/main/res/layout/statistics_listitem.xml
+++ b/app/src/main/res/layout/statistics_listitem.xml
@@ -12,7 +12,7 @@
 
     <ImageView
             android:id="@+id/imgvCover"
-            android:contentDescription="@string/cover_label"
+            android:importantForAccessibility="no"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_alignParentLeft="true"