From eb44a3ccb6a5abc3906ae2d6a1506b7e6a13e93f Mon Sep 17 00:00:00 2001 From: chagai95 <31655082+chagai95@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:55:43 +0200 Subject: [PATCH 1/3] Remove unused line --- .../im/vector/app/features/call/transfer/CallTransferActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt index b10353be13..81173568b5 100644 --- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt +++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt @@ -70,7 +70,6 @@ class CallTransferActivity : VectorBaseActivity() { }.attach() setupToolbar(views.callTransferToolbar) .allowBack() - views.callTransferToolbar.title = getString(R.string.call_transfer_title) setupConnectAction() } From 2296b89faf5315fa216770eb1bb00710b314c963 Mon Sep 17 00:00:00 2001 From: chagai95 <31655082+chagai95@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:57:29 +0200 Subject: [PATCH 2/3] Add title string in MaterialToolbar which was added later to xml --- vector/src/main/res/layout/activity_call_transfer.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vector/src/main/res/layout/activity_call_transfer.xml b/vector/src/main/res/layout/activity_call_transfer.xml index c3febc96a7..6bf334e62d 100644 --- a/vector/src/main/res/layout/activity_call_transfer.xml +++ b/vector/src/main/res/layout/activity_call_transfer.xml @@ -17,6 +17,7 @@ @@ -86,4 +87,4 @@ layout="@layout/merge_overlay_waiting_view" /> - \ No newline at end of file + From f6c0050e90b2c337954f7c1c5e9a8886d78ab5b5 Mon Sep 17 00:00:00 2001 From: chagai95 <31655082+chagai95@users.noreply.github.com> Date: Thu, 14 Apr 2022 15:11:02 +0200 Subject: [PATCH 3/3] Create 5765.bugfix --- changelog.d/5765.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/5765.bugfix diff --git a/changelog.d/5765.bugfix b/changelog.d/5765.bugfix new file mode 100644 index 0000000000..ccf8c1b2c2 --- /dev/null +++ b/changelog.d/5765.bugfix @@ -0,0 +1 @@ +Fixing setting transfer title in call transfer.