Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
a54d59bc10
1 changed files with 14 additions and 15 deletions
|
@ -140,37 +140,36 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
|
||||||
|
|
||||||
private String getVoiceSystemInfo() {
|
private String getVoiceSystemInfo() {
|
||||||
String v ="";
|
String v ="";
|
||||||
v += "App profile: " + ((OsmandApplication) getApplication()).getSettings().APPLICATION_MODE.get().getStringKey();
|
v += " \u25CF App profile: " + ((OsmandApplication) getApplication()).getSettings().APPLICATION_MODE.get().getStringKey();
|
||||||
|
|
||||||
if (((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get() == 3) {
|
if (((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get() == 3) {
|
||||||
v += "\n\nVoice guidance output: Media/music audio";
|
v += "\n \u25CF Voice guidance output: Media/music audio";
|
||||||
} else if (((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get() == 5) {
|
} else if (((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get() == 5) {
|
||||||
v += "\n\nVoice guidance output: Notification audio";
|
v += "\n \u25CF Voice guidance output: Notification audio";
|
||||||
} else if (((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get() == 0) {
|
} else if (((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get() == 0) {
|
||||||
v += "\n\nVoice guidance output: Phone call audio";
|
v += "\n \u25CF Voice guidance output: Phone call audio";
|
||||||
} else {
|
} else {
|
||||||
v += "\n\nVoice guidance output: " + ((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get();
|
v += "\n \u25CF Voice guidance output: " + ((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
v += "\n\nVoice guidance output: " + ((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get();
|
v += "\n \u25CF OsmAnd voice: " + osmandVoice;
|
||||||
v += "\n\nOsmAnd voice: " + osmandVoice;
|
v += "\n \u25CF OsmAnd voice language: " + osmandVoiceLang;
|
||||||
v += "\n\nOsmAnd voice language: " + osmandVoiceLang;
|
|
||||||
|
|
||||||
if (AbstractPrologCommandPlayer.getCurrentVersion() > 99) {
|
if (AbstractPrologCommandPlayer.getCurrentVersion() > 99) {
|
||||||
v += "\n\nVoice language availability: " + TTSCommandPlayerImpl.getTtsVoiceStatus();
|
v += "\n \u25CF Voice language availability: " + TTSCommandPlayerImpl.getTtsVoiceStatus();
|
||||||
v += "\n\nVoice actually used: " + TTSCommandPlayerImpl.getTtsVoiceUsed();
|
v += "\n \u25CF Voice actually used: " + TTSCommandPlayerImpl.getTtsVoiceUsed();
|
||||||
} else {
|
} else {
|
||||||
v += "\n\nVoice language availability: Recorded voice";
|
v += "\n \u25CF Voice language availability: Recorded voice";
|
||||||
v += "\n\nVoice actually used: Recorded voice";
|
v += "\n \u25CF Voice actually used: Recorded voice";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get() == 0) {
|
if (((OsmandApplication) getApplication()).getSettings().AUDIO_STREAM_GUIDANCE.get() == 0) {
|
||||||
v += "\n\nBT SCO: " + AbstractPrologCommandPlayer.btScoInit;
|
v += "\n \u25CF BT SCO: " + AbstractPrologCommandPlayer.btScoInit;
|
||||||
} else {
|
} else {
|
||||||
v += "\n\nBT SCO: Current profile is not set to 'Phone Call Audio'.";
|
v += "\n \u25CF BT SCO: Current profile is not set to 'Phone Call Audio'.";
|
||||||
}
|
}
|
||||||
|
|
||||||
v += "\n\nPhone call audio delay: " + ((OsmandApplication) getApplication()).getSettings().BT_SCO_DELAY.get() + "\u00A0ms";
|
v += "\n \u25CF Phone call audio delay: " + ((OsmandApplication) getApplication()).getSettings().BT_SCO_DELAY.get() + "\u00A0ms";
|
||||||
v += "\n";
|
v += "\n";
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue