Merge "AVRCP version interop pereference (3/3)" am: 48ce402668

am: 6e898e8ffd

Change-Id: Ib858c4a4da6515d6d79c54cbd9bdefea2fa09ce1
This commit is contained in:
Ajay Panicker
2017-03-23 18:03:42 +00:00
committed by android-build-merger
2 changed files with 18 additions and 0 deletions

View File

@@ -102,6 +102,19 @@
<!-- Bluetooth settings --> <!-- Bluetooth settings -->
<!-- Titles for Bluetooth AVRCP Versions -->
<string-array name="bluetooth_avrcp_versions">
<item>AVRCP 1.4 (Default)</item>
<item>AVRCP 1.5</item>
<item>AVRCP 1.6</item>
</string-array>
<!-- Values for Bluetooth AVRCP Versions -->
<string-array name="bluetooth_avrcp_version_values">
<item>avrcp14</item>
<item>avrcp15</item>
<item>avrcp16</item>
</string-array>
<!-- Titles for Bluetooth Audio Codec selection preference. [CHAR LIMIT=50] --> <!-- Titles for Bluetooth Audio Codec selection preference. [CHAR LIMIT=50] -->
<string-array name="bluetooth_a2dp_codec_titles"> <string-array name="bluetooth_a2dp_codec_titles">

View File

@@ -430,6 +430,11 @@
<!-- Setting Checkbox title for disabling Bluetooth absolute volume --> <!-- Setting Checkbox title for disabling Bluetooth absolute volume -->
<string name="bluetooth_disable_absolute_volume">Disable absolute volume</string> <string name="bluetooth_disable_absolute_volume">Disable absolute volume</string>
<!-- UI debug setting: Select Bluetooth AVRCP Version -->
<string name="bluetooth_select_avrcp_version_string">Bluetooth AVRCP Version</string>
<!-- UI debug setting: Select Bluetooth AVRCP Version -->
<string name="bluetooth_select_avrcp_version_dialog_title">Select Bluetooth AVRCP Version</string>
<!-- UI debug setting: Select Bluetooth Audio Codec --> <!-- UI debug setting: Select Bluetooth Audio Codec -->
<string name="bluetooth_select_a2dp_codec_type">Bluetooth Audio Codec</string> <string name="bluetooth_select_a2dp_codec_type">Bluetooth Audio Codec</string>
<!-- UI debug setting: Select Bluetooth Audio Codec --> <!-- UI debug setting: Select Bluetooth Audio Codec -->