Display speaker in PiP.

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsLayout.java

@@ -30,6 +30,7 @@ public class CallParticipantsLayout extends FlexboxLayout {
   private static final int CORNER_RADIUS                = ViewUtil.dpToPx(10);
 
   private List<CallParticipant> callParticipants = Collections.emptyList();
+  private CallParticipant       focusedParticipant = null;
   private boolean               shouldRenderInPip;
 
   public CallParticipantsLayout(@NonNull Context context) {
@@ -44,9 +45,10 @@ public class CallParticipantsLayout extends FlexboxLayout {
     super(context, attrs, defStyleAttr);
   }
 
-  void update(@NonNull List<CallParticipant> callParticipants, boolean shouldRenderInPip) {
+  void update(@NonNull List<CallParticipant> callParticipants, @NonNull CallParticipant focusedParticipant, boolean shouldRenderInPip) {
-    this.callParticipants  = callParticipants;
+    this.callParticipants   = callParticipants;
-    this.shouldRenderInPip = shouldRenderInPip;
+    this.focusedParticipant = focusedParticipant;
+    this.shouldRenderInPip  = shouldRenderInPip;
     updateLayout();
   }
 
@@ -55,7 +57,7 @@ public class CallParticipantsLayout extends FlexboxLayout {
 
     if (shouldRenderInPip && Util.hasItems(callParticipants)) {
       updateChildrenCount(1);
-      update(0, 1, callParticipants.get(0));
+      update(0, 1, focusedParticipant);
     } else {
       int count = callParticipants.size();
       updateChildrenCount(count);

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallParticipantsPage.java

@@ -11,34 +11,42 @@ import java.util.Objects;
 class WebRtcCallParticipantsPage {
 
   private final List<CallParticipant> callParticipants;
+  private final CallParticipant       focusedParticipant;
   private final boolean               isSpeaker;
   private final boolean               isRenderInPip;
   
   static WebRtcCallParticipantsPage forMultipleParticipants(@NonNull List<CallParticipant> callParticipants,
+                                                            @NonNull CallParticipant focusedParticipant,
                                                             boolean isRenderInPip) 
   {
-    return new WebRtcCallParticipantsPage(callParticipants, false, isRenderInPip);
+    return new WebRtcCallParticipantsPage(callParticipants, focusedParticipant, false, isRenderInPip);
   }
   
   static WebRtcCallParticipantsPage forSingleParticipant(@NonNull CallParticipant singleParticipant,
                                                          boolean isRenderInPip)
   {
-    return new WebRtcCallParticipantsPage(Collections.singletonList(singleParticipant), true, isRenderInPip);
+    return new WebRtcCallParticipantsPage(Collections.singletonList(singleParticipant), singleParticipant, true, isRenderInPip);
   }
 
   private WebRtcCallParticipantsPage(@NonNull List<CallParticipant> callParticipants,
+                                     @NonNull CallParticipant       focusedParticipant,
                                      boolean isSpeaker,
                                      boolean isRenderInPip) 
   {
-    this.callParticipants = callParticipants;
+    this.callParticipants   = callParticipants;
-    this.isSpeaker        = isSpeaker;
+    this.focusedParticipant = focusedParticipant;
-    this.isRenderInPip    = isRenderInPip;
+    this.isSpeaker          = isSpeaker;
+    this.isRenderInPip      = isRenderInPip;
   }
 
   public @NonNull List<CallParticipant> getCallParticipants() {
     return callParticipants;
   }
 
+  public @NonNull CallParticipant getFocusedParticipant() {
+    return focusedParticipant;
+  }
+
   public boolean isRenderInPip() {
     return isRenderInPip;
   }
@@ -54,11 +62,12 @@ class WebRtcCallParticipantsPage {
     WebRtcCallParticipantsPage that = (WebRtcCallParticipantsPage) o;
     return isSpeaker == that.isSpeaker &&
         isRenderInPip == that.isRenderInPip &&
+        focusedParticipant.equals(that.focusedParticipant) &&
         callParticipants.equals(that.callParticipants);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(callParticipants, isSpeaker);
+    return Objects.hash(callParticipants, isSpeaker, focusedParticipant, isRenderInPip);
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallParticipantsPagerAdapter.java

@@ -84,7 +84,7 @@ class WebRtcCallParticipantsPagerAdapter extends ListAdapter<WebRtcCallParticipa
 
     @Override
     void bind(WebRtcCallParticipantsPage page) {
-      callParticipantsLayout.update(page.getCallParticipants(), page.isRenderInPip());
+      callParticipantsLayout.update(page.getCallParticipants(), page.getFocusedParticipant(), page.isRenderInPip());
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java

@@ -255,7 +255,7 @@ public class WebRtcCallView extends FrameLayout {
     List<WebRtcCallParticipantsPage> pages = new ArrayList<>(2);
 
     if (!state.getGridParticipants().isEmpty()) {
-      pages.add(WebRtcCallParticipantsPage.forMultipleParticipants(state.getGridParticipants(), state.isInPipMode()));
+      pages.add(WebRtcCallParticipantsPage.forMultipleParticipants(state.getGridParticipants(), state.getFocusedParticipant(), state.isInPipMode()));
     }
 
     if (state.getFocusedParticipant() != null && state.getAllRemoteParticipants().size() > 1) {