From f6a03cdc63b861e2c7d228f63155f2b56080a5f6 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 26 Apr 2022 21:10:40 +0200
Subject: [PATCH 1/4] Fixes missing call icons

---
 vector/src/main/res/menu/menu_timeline.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index 45b3737019..ad4a0ea405 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -19,24 +19,27 @@
         android:title="@string/action_invite"
         app:showAsAction="never" />
 
+    <!-- We always want to show this item as an icon -->
     <item
         android:id="@+id/video_call"
         android:icon="@drawable/ic_video"
         android:title="@string/action_video_call"
         android:visible="false"
         app:iconTint="?colorPrimary"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         tools:visible="true" />
 
+    <!-- We always want to show this item as an icon -->
     <item
         android:id="@+id/voice_call"
         android:icon="@drawable/ic_phone"
         android:title="@string/call"
         android:visible="false"
         app:iconTint="?colorPrimary"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         tools:visible="true" />
 
+    <!-- We always want to show this item as an icon -->
     <item
         android:id="@+id/menu_timeline_thread_list"
         android:title="@string/action_view_threads"
@@ -44,7 +47,8 @@
         app:actionLayout="@layout/view_thread_notification_badge"
         app:iconTint="?colorPrimary"
         app:showAsAction="always"
-        tools:visible="true" />
+        tools:visible="true"
+        tools:ignore="AlwaysShowAction" />
 
     <item
         android:id="@+id/join_conference"
@@ -86,4 +90,4 @@
         android:title="@string/action_share"
         app:iconTint="?vctr_content_secondary"
         app:showAsAction="withText" />
-</menu>
\ No newline at end of file
+</menu>

From e4cd31d5ab0608b1fb7094a90bf4f7439b3105e2 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 26 Apr 2022 21:13:36 +0200
Subject: [PATCH 2/4] Adds changelog file

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

diff --git a/changelog.d/5847.bugfix b/changelog.d/5847.bugfix
new file mode 100644
index 0000000000..acd13dec9a
--- /dev/null
+++ b/changelog.d/5847.bugfix
@@ -0,0 +1 @@
+Fixes missing call icons when threads are enabled

From 6548c3cf6fcfa8038736a430e3f15d11ddc03e01 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 26 Apr 2022 21:54:54 +0200
Subject: [PATCH 3/4] Replaces call title with action_voice_call

---
 vector/src/main/res/menu/menu_timeline.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index ad4a0ea405..c122f20493 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -33,7 +33,7 @@
     <item
         android:id="@+id/voice_call"
         android:icon="@drawable/ic_phone"
-        android:title="@string/call"
+        android:title="@string/action_voice_call"
         android:visible="false"
         app:iconTint="?colorPrimary"
         app:showAsAction="always"

From 9c951687b0a605a3a315df2ad1db6fc6b71d90d6 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 26 Apr 2022 21:56:56 +0200
Subject: [PATCH 4/4] Moves tools ignore AlwaysShowAction to root of
 menu_timeline

---
 vector/src/main/res/menu/menu_timeline.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index c122f20493..8b1ea02a4a 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:id="@+id/timeline_setting"
@@ -47,8 +48,7 @@
         app:actionLayout="@layout/view_thread_notification_badge"
         app:iconTint="?colorPrimary"
         app:showAsAction="always"
-        tools:visible="true"
-        tools:ignore="AlwaysShowAction" />
+        tools:visible="true" />
 
     <item
         android:id="@+id/join_conference"