diff options
| author | 2017-03-23 18:03:42 +0000 | |
|---|---|---|
| committer | 2017-03-23 18:03:42 +0000 | |
| commit | 5a9b36027d4d7ad24cf89f9fb9e655b12153a75c (patch) | |
| tree | d4e3e001798496116426fd34ef8008dbaa48b7e0 | |
| parent | 3dcac86f4c0f8896179db20f34ed0cbe7c7e5368 (diff) | |
| parent | 6e898e8ffd1cf5b8091b65878e43f4f71a5013a6 (diff) | |
Merge "AVRCP version interop pereference (3/3)" am: 48ce402668
am: 6e898e8ffd
Change-Id: Ib858c4a4da6515d6d79c54cbd9bdefea2fa09ce1
| -rw-r--r-- | packages/SettingsLib/res/values/arrays.xml | 13 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 5 |
2 files changed, 18 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml index 1f432de600da..dbfb1188dc60 100644 --- a/packages/SettingsLib/res/values/arrays.xml +++ b/packages/SettingsLib/res/values/arrays.xml @@ -102,6 +102,19 @@ <!-- 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] --> <string-array name="bluetooth_a2dp_codec_titles"> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 845c4619411d..c51f872e49b5 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -430,6 +430,11 @@ <!-- Setting Checkbox title for disabling Bluetooth absolute volume --> <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 --> <string name="bluetooth_select_a2dp_codec_type">Bluetooth Audio Codec</string> <!-- UI debug setting: Select Bluetooth Audio Codec --> |