Kill off the option to not use RemoteControlClient.

In API level 18 the RCC will also be used for AVRCP 1.3 metadata, which
we certainly want to support. The decision whether to show the music
controls in the keyguard should be done at the framework level.

Change-Id: Ia17f9094231f3a76d1496ddf2ef2d90b2d4d9512

23 files changed, 3 insertions, 30 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 265d124..e76fcdd 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -97,7 +97,6 @@
     <string name="settings_download_missing_artwork_title">Laai vermiste albumkuns af</string>
     <string name="settings_download_artist_images_title">Laai vermiste kunstenaar foto\'s af</string>
     <string name="settings_open_source_licenses">Oopbronlisensies</string>
-    <string name="settings_use_lockscreen_controls">Gebruik sluiskerm kontroles</string>
     <string name="settings_version_title">Bouweergawe</string>
     <string name="now_listening_to">#Speel nou <xliff:g id="title">%1$s</xliff:g> deur <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Deel liedtjie d.m.v.:</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 31a36d1..4f7e876 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -121,7 +121,6 @@
     <string name="settings_download_missing_artwork_title">Stáhnout chybějící obaly alb</string>
     <string name="settings_download_artist_images_title">Stáhnout chybějící obrázky umělců</string>
     <string name="settings_open_source_licenses">Licence otevřeného software</string>
-    <string name="settings_use_lockscreen_controls">Použít ovládání na zamčené obrazovce</string>
     <string name="settings_version_title">Číslo verze</string>
 
     <string name="now_listening_to">#Přehrávání \'<xliff:g id="title">%1$s</xliff:g>\' / \'<xliff:g id="artist">%2$s</xliff:g>\' #Apollo</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a7366ce..39f4aeb 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -120,7 +120,6 @@
     <string name="settings_download_missing_artwork_title">Download manglende albumgrafik</string>
     <string name="settings_download_artist_images_title">Download manglende kunstnerbilleder</string>
     <string name="settings_open_source_licenses">Open source-licenser</string>
-    <string name="settings_use_lockscreen_controls">Brug skærmlås-kontroller</string>
     <string name="settings_version_title">Versionsnummer</string>
 
     <string name="now_listening_to">#NowPlaying <xliff:g id="title">%1$s</xliff:g> af <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3d8d932..3d7de88 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -132,7 +132,6 @@
     <string name="settings_download_missing_artwork_title">Fehlende Albencover laden</string>
     <string name="settings_download_artist_images_title">Fehlende Interpretenbilder laden</string>
     <string name="settings_open_source_licenses">Open-Source-Lizenzen</string>
-    <string name="settings_use_lockscreen_controls">Steuerung im Sperrbildschirm</string>
     <string name="settings_version_title">Version</string>
 
     <!-- Share Intent -->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index de8e672..52a98a7 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -111,7 +111,6 @@
     <string name="settings_download_missing_artwork_title">Λήψη εξωφύλλων άλμπουμ που λείπουν</string>
     <string name="settings_download_artist_images_title">Λήψη εικόνων καλλιτέχνη που λείπουν</string>
     <string name="settings_open_source_licenses">Άδειες χρήσης ανοιχτού κώδικα</string>
-    <string name="settings_use_lockscreen_controls">Χρήση ελέγχων οθόνης κλείδωματος</string>
     <string name="settings_version_title">Αρıθμός έκδοσης</string>
     <string name="now_listening_to">#NowPlaying <xliff:g id="title">%1$s</xliff:g> by <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Κοινή χρήση κομματιού με τη χρήση:</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6220eb9..72c549b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -112,7 +112,6 @@
     <string name="settings_download_missing_artwork_title">Obtener carátulas</string>
     <string name="settings_download_artist_images_title">Obtener fotos de artistas</string>
     <string name="settings_open_source_licenses">Licencias de software libre</string>
-    <string name="settings_use_lockscreen_controls">Controles pant. bloqueo</string>
     <string name="settings_version_title">Versión</string>
     <string name="now_listening_to">#Escuchando <xliff:g id="title">%1$s</xliff:g> de <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Compartir canción usando:</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6f905d1..edadf4a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -121,7 +121,6 @@
     <string name="settings_download_missing_artwork_title">Lataa albumin puuttuva kansikuva</string>
     <string name="settings_download_artist_images_title">Lataa puuttuvat esittäjän kuvat</string>
     <string name="settings_open_source_licenses">Avoimen lähdekoodin lisenssit</string>
-    <string name="settings_use_lockscreen_controls">Käytä lukitusnäytön säätimiä</string>
     <string name="settings_version_title">Versionumero</string>
 
     <string name="now_listening_to">#NowPlaying <xliff:g id="title">%1$s</xliff:g> esittäjältä <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5e47121..4fc6f04 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -111,7 +111,6 @@
     <string name="settings_download_missing_artwork_title">Télécharger les pochettes manquantes</string>
     <string name="settings_download_artist_images_title">Télécharger les photos d\'artistes manquantes</string>
     <string name="settings_open_source_licenses">Licenses open source</string>
-    <string name="settings_use_lockscreen_controls">Commandes sur l\'écran de verrouillage</string>
     <string name="settings_version_title">Numéro de version</string>
     <string name="now_listening_to">#NowPlaying <xliff:g id="title">%1$s</xliff:g> par <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Partager le titre via\u00A0:</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 16d2140..8d36e22 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -132,7 +132,6 @@
     <string name="settings_download_missing_artwork_title">Hiányzó albumborítók letöltése</string>
     <string name="settings_download_artist_images_title">Hiányzó előadóképek letöltése</string>
     <string name="settings_open_source_licenses">Nyílt forráskódú licenszek</string>
-    <string name="settings_use_lockscreen_controls">Zenevezérlés zárképernyőn</string>
     <string name="settings_version_title">Verziószám</string>
 
     <!-- Share Intent -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ca1ccf3..9b7173a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -111,7 +111,6 @@
     <string name="settings_download_missing_artwork_title">Scarica cover album</string>
     <string name="settings_download_artist_images_title">Scarica immagine artista</string>
     <string name="settings_open_source_licenses">Licenze open source</string>
-    <string name="settings_use_lockscreen_controls">Controlli schermata sblocco</string>
     <string name="settings_version_title">Versione numero</string>
     <string name="now_listening_to">#Ascoltando <xliff:g id="title">%1$s</xliff:g> di <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Condividi canzone:</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9b45bf7..f40cacf 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -121,7 +121,6 @@
     <string name="settings_download_missing_artwork_title">足りないアルバムアートをダウンロード</string>
     <string name="settings_download_artist_images_title">足りないアーティストの写真をダウンロード</string>
     <string name="settings_open_source_licenses">オープンソースライセンス</string>
-    <string name="settings_use_lockscreen_controls">ロック画面のコントロールを使う</string>
     <string name="settings_version_title">バージョン</string>
 
     <string name="now_listening_to">#NowPlaying <xliff:g id="title">%1$s</xliff:g> by <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e8bf50a..0d4ef7b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -111,7 +111,6 @@
     <string name="settings_download_missing_artwork_title">Last ned manglende albumcover</string>
     <string name="settings_download_artist_images_title">Last ned manglende artist bilder</string>
     <string name="settings_open_source_licenses">Åpen kildekode-lisenser</string>
-    <string name="settings_use_lockscreen_controls">Bruk lockscreen kontroller</string>
     <string name="settings_version_title">Versjonsnummer</string>
     <string name="now_listening_to">#NowPlaying <xliff:g id="title">%1$s</xliff:g> by <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Del spor med:</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f5a82bf..621d129 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -112,7 +112,6 @@
     <string name="settings_download_missing_artwork_title">Ontbr. albumill. downl.</string>
     <string name="settings_download_artist_images_title">Ontbr. art.afb. downl.</string>
     <string name="settings_open_source_licenses">Open-sourcelicenties</string>
-    <string name="settings_use_lockscreen_controls">Bediening op vergr.scherm</string>
     <string name="settings_version_title">Versienummer</string>
     <string name="now_listening_to">#NowPlaying <xliff:g id="title">%1$s</xliff:g> door <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Nummer delen via:</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f361578..b9792cc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -131,7 +131,6 @@
     <string name="settings_download_missing_artwork_title">Pobierz brakujące okładki albumów</string>
     <string name="settings_download_artist_images_title">Pobierz brakujące zdjęcia wykonawców</string>
     <string name="settings_open_source_licenses">Licencje open source</string>
-    <string name="settings_use_lockscreen_controls">Sterowanie na ekranie blokady</string>
     <string name="settings_version_title">Numer wersji</string>
 
     <!-- Share Intent -->
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 070e45a..14458e7 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -109,7 +109,6 @@
     <string name="settings_download_missing_artwork_title">Baixar artes de álbuns restantes</string>
     <string name="settings_download_artist_images_title">Baixar imagens de álbuns restantes</string>
     <string name="settings_open_source_licenses">Licenças de código livre</string>
-    <string name="settings_use_lockscreen_controls">Usar controles na tela de bloqueio</string>
     <string name="settings_version_title">Número de versão</string>
     <string name="share_track_using">Compartilhar faixa usando:</string>
     <string name="now_listening_to">#NowPlaying <xliff:g id="title" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> por <xliff:g id="artist" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%2$s</xliff:g> #Apollo</string>
@@ -125,4 +124,4 @@
     <string name="empty_favorite">Vão ser exibidas aqui as músicas que você marcou como favoritas.</string>
     <string name="empty_recent">Vão ser exibidos aqui os álbuns que você escutou. Tente tocar alguma música.</string>
     <string name="playlist_favorite">Favorito</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 687c5e9..fd20f15 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -109,7 +109,6 @@
     <string name="settings_download_missing_artwork_title">Baixar arte de álbuns restantes</string>
     <string name="settings_download_artist_images_title">Baixar imagens de álbuns restantes</string>
     <string name="settings_open_source_licenses">Licenças de código livre</string>
-    <string name="settings_use_lockscreen_controls">Usar controles na ecrã de bloqueio</string>
     <string name="settings_version_title">Número de versão</string>
     <string name="share_track_using">Partilhar música usando:</string>
     <string name="now_listening_to">#Em reprodução <xliff:g id="title" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> por <xliff:g id="artist" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%2$s</xliff:g> #Apollo</string>
@@ -125,4 +124,4 @@
     <string name="empty_favorite">Vão ser mostradas aqui as músicas que você marcou como favoritas.</string>
     <string name="empty_recent">Vão ser mostrados aqui os álbuns que você ouviu. Tente tocar alguma música.</string>
     <string name="playlist_favorite">Favorito</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5aa9377..b5504c3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -131,7 +131,6 @@
     <string name="settings_download_missing_artwork_title">Загружать обложки альбомов</string>
     <string name="settings_download_artist_images_title">Загружать фото исполнителей</string>
     <string name="settings_open_source_licenses">Лицензии Open source</string>
-    <string name="settings_use_lockscreen_controls">Управление на экране блокировки</string>
     <string name="settings_version_title">Версия</string>
 
     <!-- Share Intent -->
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 29a1230..96dd5b4 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -112,7 +112,6 @@
     <string name="settings_download_missing_artwork_title">Prevziať chýbajúce obrázky albumov</string>
     <string name="settings_download_artist_images_title">Prevziať chýbajúce obrázky interpretov</string>
     <string name="settings_open_source_licenses">Licencie otvoreného zdroja</string>
-    <string name="settings_use_lockscreen_controls">Použiť ovládanie na uzamknutej obrazovke</string>
     <string name="settings_version_title">Číslo verzie</string>
     <string name="now_listening_to">#Teraz počúvam skladbu <xliff:g id="title">%1$s</xliff:g> od interpreta <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Zdieľať stopu cez:</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1217569..8e7f0b9 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -112,7 +112,6 @@
     <string name="settings_download_missing_artwork_title">Kayıp albüm kapaklarını indir</string>
     <string name="settings_download_artist_images_title">Kayıp sanatçı resimlerini indir</string>
     <string name="settings_open_source_licenses">Açık kaynak lisansları</string>
-    <string name="settings_use_lockscreen_controls">Kilit ekranı kontrollerini kullan</string>
     <string name="settings_version_title">Sürüm numarası</string>
     <string name="now_listening_to">#ŞimdiÇalınıyor <xliff:g id="title">%1$s</xliff:g>, <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Parçayı şunu kullanarak paylaş:</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b995d9c..4e78931 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -111,7 +111,6 @@ limitations under the License.
     <string name="settings_download_missing_artwork_title">Завантажити обкладинки</string>
     <string name="settings_download_artist_images_title">Завантажити фото співаків</string>
     <string name="settings_open_source_licenses">Відкриті ліцензії</string>
-    <string name="settings_use_lockscreen_controls">Керувати з екрану блокування</string>
     <string name="settings_version_title">Версія</string>
     <string name="now_listening_to">#яЗаразСлухаю <xliff:g id="title">%1$s</xliff:g> від <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
     <string name="share_track_using">Відправити трек за допомогою:</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 265e923..3e8c0d7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -122,7 +122,6 @@
     <string name="settings_download_missing_artwork_title">下载缺失的专辑封面</string>
     <string name="settings_download_artist_images_title">下载缺失的艺术家的图像</string>
     <string name="settings_open_source_licenses">开源许可证</string>
-    <string name="settings_use_lockscreen_controls">使用锁屏控制</string>
     <string name="settings_version_title">版本号</string>
 
     <string name="now_listening_to">#NowPlaying <xliff:g id="title">%1$s</xliff:g> - <xliff:g id="artist">%2$s</xliff:g> #Apollo</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 308f8af..095983c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -135,7 +135,6 @@
     <string name="settings_download_missing_artwork_title">Download missing album art</string>
     <string name="settings_download_artist_images_title">Download missing artist images</string>
     <string name="settings_open_source_licenses">Open source licenses</string>
-    <string name="settings_use_lockscreen_controls">Use lockscreen controls</string>
     <string name="settings_version_title">Version number</string>
 
     <!-- Share Intent -->
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 492e936..e0cb8d9 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -28,11 +28,6 @@
         <Preference
             android:key="theme_chooser"
             android:title="@string/settings_theme_chooser_title" />
-        <!-- Enable lockscreen controls -->
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="lockscreen_controls"
-            android:title="@string/settings_use_lockscreen_controls" />
     </PreferenceCategory>
     <!-- Data catetory -->
     <PreferenceCategory android:title="@string/settings_data_category" >
@@ -86,4 +81,4 @@
         </PreferenceScreen>
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>