diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2014-06-10 17:26:22 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2014-06-10 17:26:22 -0700 |
| commit | cf2795ada0897f97fd4db963a103d05a8b64cb3a (patch) | |
| tree | 86844cc0ad6924c24a9e4402a3fc3ea281064cb5 /res/values | |
| parent | cc480686122e19c46f9e74c3c1227c9c8ff3b78c (diff) | |
| download | dsub-cf2795ada0897f97fd4db963a103d05a8b64cb3a.tar.gz dsub-cf2795ada0897f97fd4db963a103d05a8b64cb3a.tar.bz2 dsub-cf2795ada0897f97fd4db963a103d05a8b64cb3a.zip | |
#360, #331 Change to use AUDIO_NOISY event. Fixes issues with both pausing during any bluetooth disconnect, and delay when music is playing after unplugging headphones
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index e8eee980..f6ee767f 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -180,14 +180,10 @@ <string-array name="disconnectPauseValues"> <item>0</item> - <item>1</item> - <item>2</item> <item>3</item> </string-array> <string-array name="disconnectPauseNames"> <item>@string/settings.disconnect_pause_both</item> - <item>@string/settings.disconnect_pause_headphone</item> - <item>@string/settings.disconnect_pause_bluetooth</item> <item>@string/settings.disconnect_pause_neither</item> </string-array> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3cc120d6..fd0efec4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -355,9 +355,7 @@ <string name="settings.temp_loss_lower">Always lower volume</string>
<string name="settings.temp_loss_nothing">Do Nothing</string>
<string name="settings.disconnect_pause_title">Pause on Disconnect</string>
- <string name="settings.disconnect_pause_both">Pause on either</string>
- <string name="settings.disconnect_pause_headphone">Pause only for headphone</string>
- <string name="settings.disconnect_pause_bluetooth">Pause only for bluetooth</string>
+ <string name="settings.disconnect_pause_both">Pause</string>
<string name="settings.disconnect_pause_neither">Do Nothing</string>
<string name="settings.persistent_title">Persistent Notification</string>
<string name="settings.persistent_summary">Show the notification even after pausing. Press the stop button to clear it away.</string>
|