Merge "Remove "category for docks and USB devices"" into android-6.0

18 files changed, 4 insertions, 41 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 47ece94..dcd48ad 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Sluchátka</string>
   <string name="speaker_title">Reproduktor</string>
   <string name="bluetooth_title">Zařízení Bluetooth</string>
-  <string name="usb_title">USB/Dok</string>
   <string name="audio_effects">Zvukové efekty</string>
   <string name="pref_unavailable">Tato funkce není na Vašem zařízení dostupná.</string>
   <string name="dsp_settings_headset">Nastavení DSP - sluchátka</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f8358fc..b332d43 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Hovedtlf.</string>
   <string name="speaker_title">Højttaler</string>
   <string name="bluetooth_title">Bluetooth</string>
-  <string name="usb_title">USB/Dock</string>
   <string name="audio_effects">Lydeffekter</string>
   <string name="pref_unavailable">Funktionaliteten er ikke tilgængelig på din enhed</string>
   <string name="dsp_settings_headset">DSP-indstillinger - Hovedtelefoner</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bddd61c..8d262c2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Kopfhörer</string>
   <string name="speaker_title">Lautsprecher</string>
   <string name="bluetooth_title">Bluetooth-Gerät</string>
-  <string name="usb_title">USB/Dock</string>
   <string name="audio_effects">Audioeffekte</string>
   <string name="pref_unavailable">Diese Funktion ist auf diesem Gerät nicht verfügbar</string>
   <string name="dsp_settings_headset">DSP-Einstellungen - Kopfhörer</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 185ede4..6ed40cb 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Ακουστικά</string>
   <string name="speaker_title">Ηχείο</string>
   <string name="bluetooth_title">Bluetooth</string>
-  <string name="usb_title">USB/Βάση σύνδεσης</string>
   <string name="audio_effects">Ηχητικά εφέ</string>
   <string name="pref_unavailable">Η λειτουργία δεν είναι διαθέσιμη στη συσκευή σας</string>
   <string name="dsp_settings_headset">Ρυθμίσεις DSP - Ακουστικά</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dda1d1a..36cce13 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Auriculares</string>
   <string name="speaker_title">Altavoz</string>
   <string name="bluetooth_title">Bluetooth</string>
-  <string name="usb_title">USB/Base</string>
   <string name="audio_effects">Filtros de audio</string>
   <string name="pref_unavailable">Funcionalidad no disponible para el dispositivo</string>
   <string name="dsp_settings_headset">Ajustes - Auriculares</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d6e636a..2006863 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Casque</string>
   <string name="speaker_title">Haut-parleur du téléphone</string>
   <string name="bluetooth_title">Périphérique Bluetooth</string>
-  <string name="usb_title">USB/Station d\'accueil</string>
   <string name="audio_effects">Autres effets audio</string>
   <string name="pref_unavailable">Fonctionnalité non disponible pour votre appareil</string>
   <string name="dsp_settings_headset">Paramètres DSP - Casque</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4f34204..5346a53 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Fejhallgató</string>
   <string name="speaker_title">Telefon hangszóró</string>
   <string name="bluetooth_title">Bluetooth-eszköz</string>
-  <string name="usb_title">USB/Dokkoló</string>
   <string name="audio_effects">Hangeffektek</string>
   <string name="pref_unavailable">A funkció nem elérhető ezen az eszközön.</string>
   <string name="dsp_settings_headset">DSP Beállítások - Fejhallgató</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 92fc19a..3260ec0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Cuffie</string>
   <string name="speaker_title">Altoparlante telefono</string>
   <string name="bluetooth_title">Dispositivo bluetooth</string>
-  <string name="usb_title">Dispositivo USB/Dock</string>
   <string name="audio_effects">Effetti audio</string>
   <string name="pref_unavailable">Funzionalità non disponibile sul tuo dispositivo</string>
   <string name="dsp_settings_headset">Impostazioni DSP - Cuffie</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e406a66..001afb2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Headset</string>
   <string name="speaker_title">Speaker</string>
   <string name="bluetooth_title">Bluetooth</string>
-  <string name="usb_title">USB/dock</string>
   <string name="audio_effects">Geluidseffecten</string>
   <string name="pref_unavailable">Functionaliteit is niet beschikbaar voor uw apparaat</string>
   <string name="dsp_settings_headset">DSP-instellingen - Headset</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c9b7822..0b5f496 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Zestaw słuchawkowy</string>
   <string name="speaker_title">Głośnik</string>
   <string name="bluetooth_title">Urządzenie Bluetooth</string>
-  <string name="usb_title">USB/Dok</string>
   <string name="audio_effects">Efekty dźwiękowe</string>
   <string name="pref_unavailable">Funkcjonalność niedostępna dla urządzenia</string>
   <string name="dsp_settings_headset">Ustawienia DSP - Zestaw słuchawkowy</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 865655d..d5d344f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -175,6 +175,5 @@ ativado quando usando fones de ouvido estéreo.
 reverbação Haas, que pode ser usado aumentar a largura de imagem estéreo percebida.
 Isto é controlado pelo controle &#8220;Simulação de Ambiente&#8221;.
     </string>
-    <string name="usb_title">USB/Dock</string>
     <string name="dsp_settings_usb">Configurações Equalizador - Dispositivo USB</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 550ba78..4c0e0d3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Наушники</string>
   <string name="speaker_title">Динамик</string>
   <string name="bluetooth_title">Устройства Bluetooth</string>
-  <string name="usb_title">USB/Док-станция</string>
   <string name="audio_effects">Аудио эффекты</string>
   <string name="pref_unavailable">Данная функция не поддерживается на вашем устройстве</string>
   <string name="dsp_settings_headset">Настройки DSP - Наушники</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ba64dc4..9c0cf29 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">Hörlurar</string>
   <string name="speaker_title">Telefonhögtalare</string>
   <string name="bluetooth_title">Bluetoothenhet</string>
-  <string name="usb_title">USB/Docka</string>
   <string name="audio_effects">Ljudeffekter</string>
   <string name="pref_unavailable">Funktionen är inte tillgänglig på din enhet</string>
   <string name="dsp_settings_headset">Ljudinställningar - Hörlurar</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 79a0b6d..0d5c6e5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">耳机</string>
   <string name="speaker_title">扬声器</string>
   <string name="bluetooth_title">蓝牙</string>
-  <string name="usb_title">USB/基座</string>
   <string name="audio_effects">音效</string>
   <string name="pref_unavailable">此功能在您的设备上不可用</string>
   <string name="dsp_settings_headset">DSP 设置 - 耳机</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 42f0aa0..be2886c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -34,7 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <string name="headset_title">有線耳機</string>
   <string name="speaker_title">手機喇叭</string>
   <string name="bluetooth_title">藍牙裝置</string>
-  <string name="usb_title">USB/座架</string>
   <string name="audio_effects">音訊效果</string>
   <string name="pref_unavailable">此功能不可用於您的裝置上</string>
   <string name="dsp_settings_headset">數位訊號處理（DSP）設定－有線耳機</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f97815b..12024d2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,13 +33,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <string name="headset_title">Headset</string>
     <string name="speaker_title">Speaker</string>
     <string name="bluetooth_title">Bluetooth</string>
-    <string name="usb_title">USB/Dock</string>
     <string name="audio_effects">Audio effects</string>
     <string name="pref_unavailable">Functionality is not available on your device</string>
     <string name="dsp_settings_headset">DSP settings - Headset</string>
     <string name="dsp_settings_speaker">DSP settings - Phone speaker</string>
     <string name="dsp_settings_bluetooth">DSP settings - Bluetooth device</string>
-    <string name="dsp_settings_usb">DSP settings - USB device</string>
     <string name="dsp_settings_wm8994">DSP settings - WM8994</string>
     <string name="pref_dsp_title">Dynamic range compression</string>
     <string name="pref_dsp_summary_on">Compression is enabled</string>
@@ -146,7 +144,7 @@ specification, i.e. most music players.
 <b>Philosophy</b>
 \n\n
 CyanogenMod\'s audio processing supports four different output categories:
-wired headset, USB audio, phone speaker and bluetooth headset. There is a separate
+wired headset, phone speaker and bluetooth headset. There is a separate
 configuration panel for each output category. DSP Manager\'s philosophy is to
 correct each audio output\'s particular deficiencies in order to reach the most
 optimal listening experience with each.
diff --git a/src/com/bel/android/dspmanager/activity/DSPManager.java b/src/com/bel/android/dspmanager/activity/DSPManager.java
index 6e23829..859b39d 100644
--- a/src/com/bel/android/dspmanager/activity/DSPManager.java
+++ b/src/com/bel/android/dspmanager/activity/DSPManager.java
@@ -586,12 +586,6 @@ public final class DSPManager extends Activity {
         mTitleMap.put("ICON", R.drawable.empty_icon + "");
         mTitleMap.put("TITLE", getString(R.string.bluetooth_title));
         tmpList.add(mTitleMap);
-        // Usb
-        mTitleMap = new HashMap<String, String>();
-        mTitleMap.put("ICON", R.drawable.empty_icon + "");
-        mTitleMap.put("TITLE", getString(R.string.usb_title));
-        tmpList.add(mTitleMap);
-
         // Determine if WM8994 is supported
         if (WM8994.isSupported(this)) {
             mTitleMap = new HashMap<String, String>();
@@ -627,7 +621,6 @@ public final class DSPManager extends Activity {
         entryString.add("headset");
         entryString.add("speaker");
         entryString.add("bluetooth");
-        entryString.add("usb");
 
         // Determine if WM8994 is supported
         if (WM8994.isSupported(this)) {
diff --git a/src/com/bel/android/dspmanager/service/HeadsetService.java b/src/com/bel/android/dspmanager/service/HeadsetService.java
index 652e5b7..ba44473 100644
--- a/src/com/bel/android/dspmanager/service/HeadsetService.java
+++ b/src/com/bel/android/dspmanager/service/HeadsetService.java
@@ -165,11 +165,6 @@ public class HeadsetService extends Service {
     protected boolean mUseBluetooth;
 
     /**
-     * Is a dock or USB audio device plugged in?
-     */
-    protected boolean mUseUSB;
-
-    /**
      * Has DSPManager assumed control of equalizer levels?
      */
     private float[] mOverriddenEqualizerLevels;
@@ -221,15 +216,11 @@ public class HeadsetService extends Service {
             final String action = intent.getAction();
             Log.i(TAG, "onReceive " + action);
             final boolean prevUseHeadset = mUseHeadset;
-            final boolean prevUseUSB = mUseUSB;
             if (action.equals(AudioManager.ACTION_HEADSET_PLUG)) {
                 mUseHeadset = intent.getIntExtra("state", 0) == 1;
-            } else if (action.equals(AudioManager.ACTION_ANALOG_AUDIO_DOCK_PLUG)) {
-                mUseUSB = intent.getIntExtra("state", 0) == 1;
             }
-            Log.i(TAG, "Headset=" + mUseHeadset + " ; USB=" + mUseUSB);
-            if (prevUseHeadset != mUseHeadset
-                    || prevUseUSB != mUseUSB) {
+            Log.i(TAG, "Headset=" + mUseHeadset);
+            if (prevUseHeadset != mUseHeadset) {
                 updateDsp();
             }
         }
@@ -274,7 +265,6 @@ public class HeadsetService extends Service {
         registerReceiver(mAudioSessionReceiver, audioFilter);
 
         final IntentFilter intentFilter = new IntentFilter(AudioManager.ACTION_HEADSET_PLUG);
-        intentFilter.addAction(AudioManager.ACTION_ANALOG_AUDIO_DOCK_PLUG);
         registerReceiver(mRoutingReceiver, intentFilter);
 
         registerReceiver(mPreferenceUpdateReceiver,
@@ -344,9 +334,6 @@ public class HeadsetService extends Service {
         if (mUseHeadset) {
             return "headset";
         }
-        if (mUseUSB) {
-            return "usb";
-        }
         return "speaker";
     }