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

Merge "Bluetooth: Use config value for default max connected audio devices"

Browse Source
This commit is contained in:
Treehugger Robot
2018-03-01 19:34:20 +00:00
committed by Gerrit Code Review
parent 59a548b940 77ee7ea00d
commit 57f8e717c7
2 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/arrays.xml
View File

@@ -318,7 +318,8 @@
<!-- Bluetooth developer settings: Titles for maximum number of connected audio devices --> <!-- Bluetooth developer settings: Titles for maximum number of connected audio devices -->
<string-array name="bluetooth_max_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>2</item>
<item>3</item> <item>3</item>
<item>4</item> <item>4</item>
@@ -326,7 +327,8 @@
</string-array> </string-array>
<!-- Bluetooth developer settings: Values for maximum number of connected audio devices --> <!-- 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>1</item>
<item>2</item> <item>2</item>
<item>3</item> <item>3</item>

52
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -901,6 +901,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
} }
writeOverlayDisplayDevicesOptions(null); writeOverlayDisplayDevicesOptions(null);
writeAppProcessLimitOptions(null); writeAppProcessLimitOptions(null);
writeBluetoothMaxConnectedAudioDevices("");
mHaveDebugSettings = false; mHaveDebugSettings = false;
updateAllOptions(); updateAllOptions();
mDontPokeProperties = false; mDontPokeProperties = false;
@@ -1884,12 +1885,44 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mBluetoothSelectA2dpLdacPlaybackQuality.setValue(values[index]); mBluetoothSelectA2dpLdacPlaybackQuality.setValue(values[index]);
mBluetoothSelectA2dpLdacPlaybackQuality.setSummary(summaries[index]); mBluetoothSelectA2dpLdacPlaybackQuality.setSummary(summaries[index]);
// Init the maximum connected devices - Default // Init the maximum connected devices
values = getResources().getStringArray(R.array.bluetooth_max_connected_audio_devices_values); initBluetoothMaxConnectedAudioDevicesPreference();
summaries = getResources().getStringArray(R.array.bluetooth_max_connected_audio_devices); updateBluetoothMaxConnectedAudioDevicesPreference();
}
private void initBluetoothMaxConnectedAudioDevicesPreference() {
int defaultMaxConnectedAudioDevices = getResources().getInteger(
com.android.internal.R.integer.config_bluetooth_max_connected_audio_devices);
final CharSequence[] entries = mBluetoothSelectMaxConnectedAudioDevices.getEntries();
entries[0] = String.format(entries[0].toString(), defaultMaxConnectedAudioDevices);
mBluetoothSelectMaxConnectedAudioDevices.setEntries(entries);
}
private void updateBluetoothMaxConnectedAudioDevicesPreference() {
final CharSequence[] entries = mBluetoothSelectMaxConnectedAudioDevices.getEntries();
final String currentValue =
SystemProperties.get(BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_PROPERTY);
int index = 0;
if (!currentValue.isEmpty()) {
index = mBluetoothSelectMaxConnectedAudioDevices.findIndexOfValue(currentValue);
if (index < 0) {
// Reset property value when value is illegal
SystemProperties.set(BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, "");
index = 0; index = 0;
mBluetoothSelectMaxConnectedAudioDevices.setValue(values[index]); }
mBluetoothSelectMaxConnectedAudioDevices.setSummary(summaries[index]); }
mBluetoothSelectMaxConnectedAudioDevices.setValueIndex(index);
mBluetoothSelectMaxConnectedAudioDevices.setSummary(entries[index]);
}
private void writeBluetoothMaxConnectedAudioDevices(Object newValue) {
String newValueString = newValue.toString();
if (mBluetoothSelectMaxConnectedAudioDevices.findIndexOfValue(newValueString) <= 0) {
// Reset property value when default is chosen or when value is illegal
newValueString = "";
}
SystemProperties.set(BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, newValueString);
updateBluetoothMaxConnectedAudioDevicesPreference();
} }
private void writeBluetoothAvrcpVersion(Object newValue) { private void writeBluetoothAvrcpVersion(Object newValue) {
@@ -2058,15 +2091,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
} }
} }
private void writeBluetoothMaxConnectedAudioDevices(Object newValue) {
SystemProperties.set(BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES_PROPERTY, newValue.toString());
int index = mBluetoothSelectMaxConnectedAudioDevices.findIndexOfValue(newValue.toString());
if (index >= 0) {
String[] titles = getResources().getStringArray(R.array.bluetooth_max_connected_audio_devices);
mBluetoothSelectMaxConnectedAudioDevices.setSummary(titles[index]);
}
}
private void writeBluetoothConfigurationOption(Preference preference, private void writeBluetoothConfigurationOption(Preference preference,
Object newValue) { Object newValue) {
String[] summaries; String[] summaries;