From cf2795ada0897f97fd4db963a103d05a8b64cb3a Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Tue, 10 Jun 2014 17:26:22 -0700
Subject: #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

---
 res/values-de/strings.xml | 2 --
 res/values-es/strings.xml | 2 --
 res/values-hu/strings.xml | 2 --
 res/values/arrays.xml     | 4 ----
 res/values/strings.xml    | 4 +---
 5 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'res')

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5e696050..d33a6bcb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -336,8 +336,6 @@
 	<string name="settings.temp_loss_nothing">Nichts machen</string>
 	<string name="settings.disconnect_pause_title">Verhalten bei Verbindungsverlust</string>
 	<string name="settings.disconnect_pause_both">Immer pausieren</string>
-	<string name="settings.disconnect_pause_headphone">Nur bei Kopfhörer pausieren</string>
-	<string name="settings.disconnect_pause_bluetooth">Nur bei Bluetooth pausieren</string>
 	<string name="settings.disconnect_pause_neither">Nichts machen</string>
 	<string name="settings.persistent_title">Dauerhafte Benachrichtigung</string>
 	<string name="settings.persistent_summary">Zeige die Benachrichtigung auch nach pausieren der Wiedergabe.  Zum entfernen Stop auswählen.</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 84b7c35c..ad182ded 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -328,8 +328,6 @@
 	<string name="settings.temp_loss_nothing">No hacer nada</string>
 	<string name="settings.disconnect_pause_title">Pausar al desconectar</string>
 	<string name="settings.disconnect_pause_both">Pausar en todos los casos</string>
-	<string name="settings.disconnect_pause_headphone">Pausar sólo con auriculares</string>
-	<string name="settings.disconnect_pause_bluetooth">Pausar sólo en bluetooth</string>
 	<string name="settings.disconnect_pause_neither">No hacer nada</string>
 	<string name="settings.persistent_title">Notificación permanente</string>
 	<string name="settings.persistent_summary">Mostrar la notificación incluso tras pausar. Pulsar botón stop para quitarlo.</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index ffeb1282..a5be84ac 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -347,8 +347,6 @@
 	<string name="settings.temp_loss_nothing">Ne csináljon semmit.</string>
 	<string name="settings.disconnect_pause_title">Megállítás kapcsolatbontás esetén</string>
 	<string name="settings.disconnect_pause_both">Megállítás minden esetben.</string>
-	<string name="settings.disconnect_pause_headphone">Megállítás fejhallgató használata esetén.</string>
-	<string name="settings.disconnect_pause_bluetooth">Megállítás bluetooth használata esetén.</string>
 	<string name="settings.disconnect_pause_neither">Ne csináljon semmit.</string>
 	<string name="settings.persistent_title">Állandó kijelzés</string>
 	<string name="settings.persistent_summary">Kijelzés az értesítési sávon a lejátszás megállítása után is. Nyomja meg a stop gombot a törléséhez!</string>
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>
-- 
cgit v1.2.3