PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: Use config value for default max connected audio devices

Browse Source 
* The first option in Bluetooth max connected audio devices preference
  should be using system default
* Added template based string array to show system default in the list
  preference and in preference summary when default is chosen
* Reset max connected audio devices property to empty string when
  development setting is disabled or when system default is chosen
* Added instrumentation test to check preference array size and whether
  default value is within range of preference array values
* Modified robolectric tests to verify the updated behaviors

Bug: 64767509
Test: Enable and disable multi-device mode in development settings
      make -j32 RunSettingsRoboTests
      atest SettingsUnitTests:BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest
Change-Id: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4
This commit is contained in:
Jack He
2018-02-27 16:42:57 -08:00
parent 43a2878215
commit 2b0dbf7d24
4 changed files with 182 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/arrays.xml
View File

@@ -313,7 +313,8 @@
<!-- Bluetooth developer settings: Titles for maximum number of connected audio devices -->
<string-array name="bluetooth_max_connected_audio_devices">
<item>1 (Default)</item>
<item>Use System Default: <xliff:g id="default_bluetooth_max_connected_audio_devices">%1$d</xliff:g></item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
@@ -321,7 +322,8 @@
</string-array>
<!-- Bluetooth developer settings: Values for maximum number of connected audio devices -->
<string-array name="bluetooth_max_connected_audio_devices_values">
<string-array translatable="false" name="bluetooth_max_connected_audio_devices_values">
<item></item>
<item>1</item>
<item>2</item>
<item>3</item>