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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-07-17 10:24:57 +02:00
commit 82e382d7c6
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file

@ -363,14 +363,14 @@ public class OsmandApplication extends MultiDexApplication {
}
public void initVoiceCommandPlayer(final Activity uiContext) {
showDialogInitializingCommandPlayer(uiContext, true, null, false, false);
initVoiceCommandPlayer(uiContext, true, null, false, false);
}
public void showDialogInitializingCommandPlayer(final Activity uiContext, boolean warningNoneProvider) {
showDialogInitializingCommandPlayer(uiContext, warningNoneProvider, null, true, false);
public void initVoiceCommandPlayer(final Activity uiContext, boolean warningNoneProvider) {
initVoiceCommandPlayer(uiContext, warningNoneProvider, null, true, false);
}
public void showDialogInitializingCommandPlayer(final Activity uiContext, boolean warningNoneProvider, Runnable run, boolean showDialog, boolean force) {
public void initVoiceCommandPlayer(final Activity uiContext, boolean warningNoneProvider, Runnable run, boolean showDialog, boolean force) {
String voiceProvider = osmandSettings.VOICE_PROVIDER.get();
if (voiceProvider == null || OsmandSettings.VOICE_PROVIDER_NOT_USE.equals(voiceProvider)) {
if (warningNoneProvider && voiceProvider == null) {

2
OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
View file

@ -456,7 +456,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
startActivity(intent);
} else {
super.onPreferenceChange(preference, newValue);
getMyApplication().showDialogInitializingCommandPlayer(this, false);
getMyApplication().initVoiceCommandPlayer(this, false);
}
return true;
}

2
OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
View file

@ -113,7 +113,7 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
final OsmandApplication app = (OsmandApplication) getApplication();
getSupportActionBar().setTitle(app.getString(R.string.test_voice_prompts) + " (" + entrieValues[which] + ")");
app.getSettings().VOICE_PROVIDER.set(entrieValues[which]);
app.showDialogInitializingCommandPlayer(TestVoiceActivity.this, true, new Runnable() {
app.initVoiceCommandPlayer(TestVoiceActivity.this, true, new Runnable() {
@Override
public void run() {

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java
View file

@ -269,7 +269,7 @@ public class RoutePreferencesMenu {
public static void applyVoiceProvider(MapActivity mapActivity, String provider) {
mapActivity.getMyApplication().getSettings().VOICE_PROVIDER.set(provider);
mapActivity.getMyApplication().showDialogInitializingCommandPlayer(mapActivity, false);
mapActivity.getMyApplication().initVoiceCommandPlayer(mapActivity, false);
}
private static Set<String> getVoiceFiles(MapActivity mapActivity) {