From b2730b7b1042d3a2250d84417d81fa031d249601 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 4 Jan 2018 16:38:15 -0800 Subject: [PATCH] Add developer menu to select max number of connected audio devices The new developer option modifies the system property "persist.bluetooth.maxconnectedaudiodevices"; it allows testing multiple connected devices for A2DP, AVRCP, HFP. Bug: 71603731 Test: Robolectric test Change-Id: Ie7887065f98193f4f34e0ff4a29959694e417124 --- res/values/arrays.xml | 18 +++ res/values/strings.xml | 5 + res/xml/development_settings.xml | 7 + ...ectedAudioDevicesPreferenceController.java | 102 +++++++++++++ .../DevelopmentSettingsDashboardFragment.java | 1 + ...dAudioDevicesPreferenceControllerTest.java | 141 ++++++++++++++++++ 6 files changed, 274 insertions(+) create mode 100644 src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml index aa8a5868387..dbcfee11f80 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -309,6 +309,24 @@ Never time out + + + 1 (Default) + 2 + 3 + 4 + 5 + + + + + 1 + 2 + 3 + 4 + 5 + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 851a925cfe1..724cbc3c0eb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1624,6 +1624,11 @@ Remember settings + + Maximum number of connected Bluetooth audio devices + + Select maximum number of connected Bluetooth audio devices + Cast diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 60efcab79cf..fe8f36e0a63 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -286,6 +286,13 @@ android:entries="@array/bluetooth_a2dp_codec_ldac_playback_quality_titles" android:entryValues="@array/bluetooth_a2dp_codec_ldac_playback_quality_values" /> + +