mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix several issues with local expandable pip.

fork-5.53.8
Alex Hart 2021-01-21 13:27:55 -04:00 zatwierdzone przez Greyson Parrelli
rodzic 1553f9b75d
commit e80033c287
1 zmienionych plików z 11 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java
Wyświetl plik

@ -43,6 +43,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.google.android.material.button.MaterialButton; import com.google.android.material.button.MaterialButton;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.animation.ResizeAnimation; import org.thoughtcrime.securesms.animation.ResizeAnimation;
import org.thoughtcrime.securesms.components.AccessibleToggleButton; import org.thoughtcrime.securesms.components.AccessibleToggleButton;
@ -330,7 +331,6 @@ public class WebRtcCallView extends FrameLayout {
} }
public void updateLocalCallParticipant(@NonNull WebRtcLocalRenderState state, @NonNull CallParticipant localCallParticipant, @NonNull CallParticipant focusedParticipant) { public void updateLocalCallParticipant(@NonNull WebRtcLocalRenderState state, @NonNull CallParticipant localCallParticipant, @NonNull CallParticipant focusedParticipant) {
smallLocalRender.setMirror(localCallParticipant.getCameraDirection() == CameraState.Direction.FRONT);
largeLocalRender.setMirror(localCallParticipant.getCameraDirection() == CameraState.Direction.FRONT); largeLocalRender.setMirror(localCallParticipant.getCameraDirection() == CameraState.Direction.FRONT);
smallLocalRender.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL); smallLocalRender.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL);
@ -346,11 +346,12 @@ public class WebRtcCallView extends FrameLayout {
if (state == WebRtcLocalRenderState.EXPANDED) { if (state == WebRtcLocalRenderState.EXPANDED) {
expandPip(localCallParticipant, focusedParticipant); expandPip(localCallParticipant, focusedParticipant);
return; return;
} else if (state == WebRtcLocalRenderState.SMALL_RECTANGLE && pictureInPictureExpansionHelper.isExpandedOrExpanding()) { } else if ((state == WebRtcLocalRenderState.SMALL_RECTANGLE || state == WebRtcLocalRenderState.GONE) && pictureInPictureExpansionHelper.isExpandedOrExpanding()) {
shrinkPip(localCallParticipant); shrinkPip(localCallParticipant);
return; return;
} else { } else {
smallLocalRender.setCallParticipant(localCallParticipant); smallLocalRender.setCallParticipant(localCallParticipant);
smallLocalRender.setMirror(localCallParticipant.getCameraDirection() == CameraState.Direction.FRONT);
} }
switch (state) { switch (state) {
@ -597,11 +598,14 @@ public class WebRtcCallView extends FrameLayout {
@Override @Override
public void onPictureInPictureExpanded() { public void onPictureInPictureExpanded() {
largeLocalRenderFrame.setVisibility(View.VISIBLE); largeLocalRenderFrame.setVisibility(View.VISIBLE);
largeLocalRenderNoVideo.setVisibility(View.GONE);
largeLocalRenderNoVideoAvatar.setVisibility(View.GONE);
} }
@Override @Override
public void onPictureInPictureNotVisible() { public void onPictureInPictureNotVisible() {
smallLocalRender.setCallParticipant(focusedParticipant); smallLocalRender.setCallParticipant(focusedParticipant);
smallLocalRender.setMirror(false);
} }
@Override @Override
@ -626,6 +630,11 @@ public class WebRtcCallView extends FrameLayout {
@Override @Override
public void onPictureInPictureNotVisible() { public void onPictureInPictureNotVisible() {
smallLocalRender.setCallParticipant(localCallParticipant); smallLocalRender.setCallParticipant(localCallParticipant);
smallLocalRender.setMirror(localCallParticipant.getCameraDirection() == CameraState.Direction.FRONT);
if (!localCallParticipant.isVideoEnabled()) {
smallLocalRenderFrame.setVisibility(View.GONE);
}
} }
@Override @Override