From 3f8e6c26a348562799762ae1289195e557a02eaa Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Wed, 14 Aug 2013 12:26:03 -0400
Subject: Adds an option to pause audio while audio focus is lost.  This is
 helpful when using navigation apps (for example) so that you can hear what
 the navigation app says and you don't miss whatever was being said on your
 podcast. Without this setting checked they may wind up talking over each
 other, which can be confusing.

---
 res/values/strings.xml  | 2 ++
 res/xml/preferences.xml | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b3f9975cb..2060dc777 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -250,5 +250,7 @@
     <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_pausePlaybackForNotifications_sum">Pause playback instead of lowering volume when another app wants to play sounds</string>
+    <string name="pref_pausePlaybackForNotifications_title">Pause for notifications</string>
 
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index e94d1c47e..2cc4c7237 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -17,7 +17,12 @@
             android:key="prefFollowQueue"
             android:summary="@string/pref_followQueue_sum"
             android:title="@string/pref_followQueue_title" />
-        
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="prefPauseForNotifications"
+            android:summary="@string/pref_pausePlaybackForNotifications_sum"
+            android:title="@string/pref_pausePlaybackForNotifications_title" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/network_pref" >
         <ListPreference
-- 
cgit v1.2.3


From bd4c365c1147a214d20d33a6c2989b247452a732 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Wed, 14 Aug 2013 12:47:04 -0400
Subject: updated name of the preference to use 'FocusLoss' rather than
 'Notifications' to more accurately reflect what it does

---
 res/values/strings.xml  | 4 ++--
 res/xml/preferences.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2060dc777..cf33d0b4c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -250,7 +250,7 @@
     <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_pausePlaybackForNotifications_sum">Pause playback instead of lowering volume when another app wants to play sounds</string>
-    <string name="pref_pausePlaybackForNotifications_title">Pause for notifications</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>
 
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 2cc4c7237..931aa5c2d 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -20,9 +20,9 @@
         <CheckBoxPreference
             android:defaultValue="false"
             android:enabled="true"
-            android:key="prefPauseForNotifications"
-            android:summary="@string/pref_pausePlaybackForNotifications_sum"
-            android:title="@string/pref_pausePlaybackForNotifications_title" />
+            android:key="prefPauseForFocusLoss"
+            android:summary="@string/pref_pausePlaybackForFocusLoss_sum"
+            android:title="@string/pref_pausePlaybackForFocusLoss_title" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/network_pref" >
         <ListPreference
-- 
cgit v1.2.3