diff --git a/OsmAnd/res/xml/navigation_settings.xml b/OsmAnd/res/xml/navigation_settings.xml index 1a1a1b2be2..06b77b2c16 100644 --- a/OsmAnd/res/xml/navigation_settings.xml +++ b/OsmAnd/res/xml/navigation_settings.xml @@ -14,7 +14,6 @@ - INTERRUPT_MUSIC = new BooleanPreference("interrupt_music", false).makeProfile().cache(); - { - INTERRUPT_MUSIC.setModeDefaultValue(ApplicationMode.CAR, true); - INTERRUPT_MUSIC.setModeDefaultValue(ApplicationMode.PEDESTRIAN, true); - } + public final CommonPreference INTERRUPT_MUSIC = new BooleanPreference("interrupt_music", true).makeGlobal(); // this value string is synchronized with settings_pref.xml preference name diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 356b2785c4..44a2b487e0 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -247,6 +247,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { } }); cat.addPreference(lp); + cat.addPreference(createCheckBoxPreference(settings.INTERRUPT_MUSIC, R.string.interrupt_music, + R.string.interrupt_music_descr)); } applicationModePreference = (ListPreference) screen.findPreference(settings.APPLICATION_MODE.getId()); diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java index 95cd54f5b4..415ae35e77 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java @@ -85,7 +85,6 @@ public class SettingsNavigationActivity extends SettingsBaseActivity { registerBooleanPreference(settings.SNAP_TO_ROAD, screen); - registerBooleanPreference(settings.INTERRUPT_MUSIC, screen); registerBooleanPreference(settings.USE_COMPASS_IN_NAVIGATION, screen); Integer[] intValues = new Integer[] { 0, 5, 10, 15, 20, 25, 30, 45, 60, 90};