diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-10-03 13:15:47 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-10-03 13:15:47 +0200 |
| commit | 088878fcfd69dd07d26cf612ac72125efd252a7b (patch) | |
| tree | 3f83e9a9c79191c750be63dfa78624942fd86e7a /res | |
| parent | 83bb0a608440c21ce61af68df0a8be0c387f1c0c (diff) | |
| parent | c960a65189014fddbf7336c028385b350fdca504 (diff) | |
| download | AntennaPod-088878fcfd69dd07d26cf612ac72125efd252a7b.zip | |
Merge branch 'pause-on-interrupt' of git://github.com/TomHennen/AntennaPod into TomHennen-pause-on-interrupt
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 30590a719..46a91a295 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -309,9 +309,11 @@ <string name="folder_not_empty_dialog_title">Folder is not empty</string> <string name="folder_not_empty_dialog_msg">The folder you have selected is not empty. Media downloads and other files will be placed directly in this folder. Continue anyway?</string> <string name="set_to_default_folder">Choose default folder</string> + <string name="pref_pausePlaybackForFocusLoss_sum">Pause playback instead of lowering volume when another app wants to play sounds</string> + <string name="pref_pausePlaybackForFocusLoss_title">Pause for interruptions</string> <!-- Online feed view --> <string name="subscribe_label">Subscribe</string> <string name="subscribed_label">Subscribed</string> <string name="downloading_label">Downloading...</string> -</resources>
\ No newline at end of file +</resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 65507a346..10b571305 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -31,6 +31,13 @@ android:key="prefPlaybackSpeedLauncher" android:summary="@string/pref_playback_speed_sum" android:title="@string/pref_playback_speed_title" /> + + <CheckBoxPreference + android:defaultValue="false" + android:enabled="true" + android:key="prefPauseForFocusLoss" + android:summary="@string/pref_pausePlaybackForFocusLoss_sum" + android:title="@string/pref_pausePlaybackForFocusLoss_title" /> </PreferenceCategory> <PreferenceCategory android:title="@string/network_pref"> <ListPreference @@ -127,4 +134,4 @@ </PreferenceCategory> -</PreferenceScreen>
\ No newline at end of file +</PreferenceScreen> |