Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove extra voice type default again (#5488)

Browse source
This commit is contained in:
sonora 2019-07-27 10:19:13 +02:00
parent fafa1146fd
commit 247f64eb47
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
View file

@ -251,11 +251,12 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
private void addVoicePrefs(PreferenceGroup cat) {
if (!Version.isBlackberry((OsmandApplication) getApplication())) {
String[] streamTypes = new String[]{getString(R.string.voice_stream_music), getString(R.string.voice_stream_notification),
getString(R.string.voice_stream_voice_call), getString(R.string.shared_string_default)};
String[] streamTypes = new String[]{getString(R.string.voice_stream_music),
getString(R.string.voice_stream_notification), getString(R.string.voice_stream_voice_call)};
//getString(R.string.shared_string_default)};
Integer[] streamIntTypes = new Integer[]{AudioManager.STREAM_MUSIC,
AudioManager.STREAM_NOTIFICATION, AudioManager.STREAM_VOICE_CALL,
AudioManager.USE_DEFAULT_STREAM_TYPE};
AudioManager.STREAM_NOTIFICATION, AudioManager.STREAM_VOICE_CALL);
//AudioManager.USE_DEFAULT_STREAM_TYPE};
ListPreference lp = createListPreference(
settings.AUDIO_STREAM_GUIDANCE, streamTypes, streamIntTypes , R.string.choose_audio_stream,
R.string.choose_audio_stream_descr);

4
OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java
View file

@ -334,7 +334,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
try {
AudioManager mAudioManager = (AudioManager) ctx.getSystemService(Context.AUDIO_SERVICE);
if (mAudioManager == null || !mAudioManager.isBluetoothScoAvailableOffCall()) {
btScoInit = "Reported not available.";
btScoInit = "Reported not available.";
return false;
}
mAudioManager.setMode(0);
@ -345,7 +345,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
} catch (Exception e) {
System.out.println("Exception starting BT SCO " + e.getMessage() );
btScoStatus = false;
btScoInit = "Available, but not initializad.\n(" + e.getMessage() + ")";
btScoInit = "Available, but not initializad.\n(" + e.getMessage() + ")";
return false;
}
btScoInit = "Available, initialized OK.";