From 73a706386724c471880496e234ee250eebe7b419 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 6 Apr 2023 10:42:02 -0300
Subject: [PATCH] Fix toolbar state management and pip.

---
 .../components/webrtc/WebRtcCallView.java     | 26 ++++++++++++-------
 app/src/main/res/layout/webrtc_call_view.xml  |  1 -
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
index 6ab156438b..05df0fe2b9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
@@ -185,9 +185,9 @@ public class WebRtcCallView extends ConstraintLayout {
     footerGradient                = findViewById(R.id.call_screen_footer_gradient);
     startCallControls             = findViewById(R.id.call_screen_start_call_controls);
     callParticipantsPager         = findViewById(R.id.call_screen_participants_pager);
-    callParticipantsRecycler = findViewById(R.id.call_screen_participants_recycler);
-    largeHeader              = findViewById(R.id.call_screen_header);
-    startCall                = findViewById(R.id.call_screen_start_call_start_call);
+    callParticipantsRecycler      = findViewById(R.id.call_screen_participants_recycler);
+    largeHeader                   = findViewById(R.id.call_screen_header);
+    startCall                     = findViewById(R.id.call_screen_start_call_start_call);
     errorButton                   = findViewById(R.id.call_screen_error_cancel);
     groupCallSpeakerHint          = new Stub<>(findViewById(R.id.call_screen_group_call_speaker_hint));
     groupCallFullStub             = new Stub<>(findViewById(R.id.group_call_call_full_view));
@@ -224,6 +224,8 @@ public class WebRtcCallView extends ConstraintLayout {
       }
     });
 
+    topViews.add(collapsedToolbar);
+    topViews.add(headerToolbar);
     topViews.add(largeHeader);
     topViews.add(topGradient);
 
@@ -997,13 +999,19 @@ public class WebRtcCallView extends ConstraintLayout {
     constraintSet.applyTo(parent);
 
     if (showSmallHeader) {
-      collapsedToolbar.setVisibility(View.VISIBLE);
-      headerToolbar.setVisibility(View.GONE);
-      largeHeader.setVisibility(View.GONE);
+      collapsedToolbar.setEnabled(true);
+      collapsedToolbar.setAlpha(1);
+      headerToolbar.setEnabled(false);
+      headerToolbar.setAlpha(0);
+      largeHeader.setEnabled(false);
+      largeHeader.setAlpha(0);
     } else {
-      collapsedToolbar.setVisibility(View.GONE);
-      headerToolbar.setVisibility(View.VISIBLE);
-      largeHeader.setVisibility(View.VISIBLE);
+      collapsedToolbar.setEnabled(false);
+      collapsedToolbar.setAlpha(0);
+      headerToolbar.setEnabled(true);
+      headerToolbar.setAlpha(1);
+      largeHeader.setEnabled(true);
+      largeHeader.setAlpha(1);
     }
   }
 
diff --git a/app/src/main/res/layout/webrtc_call_view.xml b/app/src/main/res/layout/webrtc_call_view.xml
index a7ee0a9042..1f3b6b08fe 100644
--- a/app/src/main/res/layout/webrtc_call_view.xml
+++ b/app/src/main/res/layout/webrtc_call_view.xml
@@ -214,7 +214,6 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/signal_m3_toolbar_height"
             android:minHeight="@dimen/signal_m3_toolbar_height"
-            android:visibility="gone"
             app:layout_constraintTop_toTopOf="@id/call_screen_status_bar_guideline"
             app:menu="@menu/webrtc_toolbar_menu"
             app:navigationIcon="@drawable/ic_arrow_left_24"