From 247f64eb47b32e6bc54419512bc21dc2de4813c6 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 27 Jul 2019 10:19:13 +0200 Subject: [PATCH] remove extra voice type default again (#5488) --- .../plus/activities/SettingsNavigationActivity.java | 9 +++++---- .../osmand/plus/voice/AbstractPrologCommandPlayer.java | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java index c5bc51bf37..1f92b7b8fb 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java @@ -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); diff --git a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java index 0e8ad1b997..5ef2f8698a 100644 --- a/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java +++ b/OsmAnd/src/net/osmand/plus/voice/AbstractPrologCommandPlayer.java @@ -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.";