Removed sonar ping from calls.

People rarely understood what it meant, and the information is available
on the screen if-needed ('dialing' vs 'ringing').
fork-5.53.8
Greyson Parrelli 2019-01-30 15:42:21 -08:00
rodzic c5114e2cb3
commit 9797c54a4d
4 zmienionych plików z 2 dodań i 9 usunięć

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -426,7 +426,7 @@ public class WebRtcCallService extends Service implements InjectableType,
sendMessage(WebRtcViewModel.State.CALL_OUTGOING, recipient, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled);
lockManager.updatePhoneState(LockManager.PhoneState.IN_CALL);
audioManager.initializeAudioForCall();
audioManager.startOutgoingRinger(OutgoingRinger.Type.SONAR);
audioManager.startOutgoingRinger(OutgoingRinger.Type.RINGING);
bluetoothStateManager.setWantsConnection(true);
setCallInProgressNotification(TYPE_OUTGOING_RINGING, recipient);
@ -591,7 +591,6 @@ public class WebRtcCallService extends Service implements InjectableType,
if (this.recipient == null) throw new AssertionError("assert");
this.callState = CallState.STATE_REMOTE_RINGING;
this.audioManager.startOutgoingRinger(OutgoingRinger.Type.RINGING);
sendMessage(WebRtcViewModel.State.CALL_RINGING, recipient, localCameraState, remoteVideoEnabled, bluetoothAvailable, microphoneEnabled);
}

Wyświetl plik

@ -16,7 +16,6 @@ public class OutgoingRinger {
private static final String TAG = OutgoingRinger.class.getSimpleName();
public enum Type {
SONAR,
RINGING,
BUSY
}
@ -32,8 +31,7 @@ public class OutgoingRinger {
public void start(Type type) {
int soundId;
if (type == Type.SONAR) soundId = R.raw.redphone_sonarping;
else if (type == Type.RINGING) soundId = R.raw.redphone_outring;
if (type == Type.RINGING) soundId = R.raw.redphone_outring;
else if (type == Type.BUSY) soundId = R.raw.redphone_busy;
else throw new IllegalArgumentException("Not a valid sound type");

Wyświetl plik

@ -60,10 +60,6 @@ public class SignalAudioManager {
AudioManager audioManager = ServiceUtil.getAudioManager(context);
audioManager.setMicrophoneMute(false);
if (type == OutgoingRinger.Type.SONAR) {
audioManager.setSpeakerphoneOn(false);
}
audioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);
outgoingRinger.start(type);