paint local mic off button in pip

Daniel Gultsch created 5 years ago

Change summary

src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java | 11 +
src/main/res/layout/activity_rtp_session.xml                    | 13 +++
2 files changed, 21 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java

@@ -21,8 +21,6 @@ import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
-import org.webrtc.PeerConnection;
-import org.webrtc.RendererCommon;
 import org.webrtc.SurfaceViewRenderer;
 import org.webrtc.VideoTrack;
 
@@ -84,7 +82,6 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
                 | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
                 | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
                 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
-        Log.d(Config.LOGTAG, "RtpSessionActivity.onCreate()");
         this.binding = DataBindingUtil.setContentView(this, R.layout.activity_rtp_session);
         setSupportActionBar(binding.toolbar);
     }
@@ -560,6 +557,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
         if (END_CARD.contains(state) || state == RtpEndUserState.ENDING_CALL) {
             binding.localVideo.setVisibility(View.GONE);
             binding.remoteVideo.setVisibility(View.GONE);
+            binding.pipLocalMicOffIndicator.setVisibility(View.GONE);
             if (isPictureInPicture()) {
                 binding.appBarLayout.setVisibility(View.GONE);
                 binding.pipPlaceholder.setVisibility(View.VISIBLE);
@@ -584,6 +582,7 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
             binding.pipPlaceholder.setVisibility(View.VISIBLE);
             binding.pipWarning.setVisibility(View.GONE);
             binding.pipWaiting.setVisibility(View.VISIBLE);
+            binding.pipLocalMicOffIndicator.setVisibility(View.GONE);
             return;
         }
         final Optional<VideoTrack> localVideoTrack = requireRtpConnection().geLocalVideoTrack();
@@ -607,9 +606,15 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
                 getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
                 binding.remoteVideo.setVisibility(View.GONE);
             }
+            if (isPictureInPicture() && !requireRtpConnection().isMicrophoneEnabled()) {
+                binding.pipLocalMicOffIndicator.setVisibility(View.VISIBLE);
+            } else {
+                binding.pipLocalMicOffIndicator.setVisibility(View.GONE);
+            }
         } else {
             getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
             binding.remoteVideo.setVisibility(View.GONE);
+            binding.pipLocalMicOffIndicator.setVisibility(View.GONE);
         }
     }
 

src/main/res/layout/activity_rtp_session.xml

@@ -62,6 +62,7 @@
 
         </android.support.design.widget.AppBarLayout>
 
+
         <org.webrtc.SurfaceViewRenderer
             android:id="@+id/local_video"
             android:layout_width="@dimen/local_video_preview_width"
@@ -85,6 +86,18 @@
             android:layout_alignParentBottom="true"
             android:visibility="gone" />
 
+        <ImageView
+            android:id="@+id/pip_local_mic_off_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:alpha="0.7"
+            android:layout_margin="8dp"
+            android:src="@drawable/ic_mic_off_black_24dp"
+            android:tint="@color/white"
+            android:visibility="gone" />
 
         <RelativeLayout
             android:layout_width="288dp"