Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"
Bug: 275388899
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioAllowListPreferenceControllerTest
Change-Id: Ic936eb22aa4f6efd97d3a84b23a44fab83dd09a0
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f942ba9..03184b9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -360,10 +360,10 @@
<!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
<string name="bluetooth_disable_hw_offload_dialog_cancel">Cancel</string>
- <!-- Setting Checkbox title for enabling Bluetooth LE Audio feature. [CHAR LIMIT=40] -->
- <string name="bluetooth_enable_leaudio">Enable Bluetooth LE audio</string>
- <!-- Summary of checkbox for enabling Bluetooth LE audio [CHAR LIMIT=none]-->
- <string name="bluetooth_enable_leaudio_summary">Enables Bluetooth LE audio feature if the device supports LE audio hardware capabilities.</string>
+ <!-- Setting Checkbox title for disabling Bluetooth LE Audio feature. [CHAR LIMIT=40] -->
+ <string name="bluetooth_disable_leaudio">Disable Bluetooth LE audio</string>
+ <!-- Summary of checkbox for disabling Bluetooth LE audio [CHAR LIMIT=none]-->
+ <string name="bluetooth_disable_leaudio_summary">Disables Bluetooth LE audio feature if the device supports LE audio hardware capabilities.</string>
<!-- Setting Checkbox title for enabling Bluetooth LE Audio Allow List. [CHAR LIMIT=none] -->
<string name="bluetooth_enable_leaudio_allow_list">Enable Bluetooth LE audio Allow List</string>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 8cdb388..998b1e2 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -340,9 +340,9 @@
android:summary="@string/bluetooth_disable_absolute_volume_summary" />
<SwitchPreference
- android:key="bluetooth_enable_leaudio"
- android:title="@string/bluetooth_enable_leaudio"
- android:summary="@string/bluetooth_enable_leaudio_summary" />
+ android:key="bluetooth_disable_leaudio"
+ android:title="@string/bluetooth_disable_leaudio"
+ android:summary="@string/bluetooth_disable_leaudio_summary" />
<SwitchPreference
android:key="bluetooth_enable_leaudio_allow_list"
diff --git a/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceController.java b/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceController.java
index 23506b3..a643a20 100644
--- a/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceController.java
@@ -44,12 +44,6 @@
static final String LE_AUDIO_ALLOW_LIST_ENABLED_PROPERTY =
"persist.bluetooth.leaudio.enable_allow_list";
- private static final String LE_AUDIO_DYNAMIC_SWITCH_PROPERTY =
- "ro.bluetooth.leaudio_switcher.supported";
- @VisibleForTesting
- static final String LE_AUDIO_DYNAMIC_ENABLED_PROPERTY =
- "persist.bluetooth.leaudio_switcher.enabled";
-
@VisibleForTesting
BluetoothAdapter mBluetoothAdapter;
@@ -83,16 +77,9 @@
return;
}
- int leAudioSupportedState = mBluetoothAdapter.isLeAudioSupported();
- boolean leAudioEnabled = false;
-
- if ((leAudioSupportedState == BluetoothStatusCodes.FEATURE_SUPPORTED)
- || (leAudioSupportedState == BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED
- && SystemProperties.getBoolean(LE_AUDIO_DYNAMIC_SWITCH_PROPERTY, false)
- && SystemProperties.getBoolean(LE_AUDIO_DYNAMIC_ENABLED_PROPERTY, false))) {
- leAudioEnabled = true;
- }
-
+ final int leAudioSupportedState = mBluetoothAdapter.isLeAudioSupported();
+ final boolean leAudioEnabled =
+ (leAudioSupportedState == BluetoothStatusCodes.FEATURE_SUPPORTED);
final boolean leAudioAllowListSupport =
SystemProperties.getBoolean(LE_AUDIO_ALLOW_LIST_SWITCH_SUPPORT_PROPERTY, false);
diff --git a/src/com/android/settings/development/BluetoothLeAudioPreferenceController.java b/src/com/android/settings/development/BluetoothLeAudioPreferenceController.java
index 867bc2a..9cbbc7f 100644
--- a/src/com/android/settings/development/BluetoothLeAudioPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothLeAudioPreferenceController.java
@@ -36,13 +36,13 @@
extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
- private static final String PREFERENCE_KEY = "bluetooth_enable_leaudio";
+ private static final String PREFERENCE_KEY = "bluetooth_disable_leaudio";
private static final String LE_AUDIO_DYNAMIC_SWITCH_PROPERTY =
"ro.bluetooth.leaudio_switcher.supported";
@VisibleForTesting
- static final String LE_AUDIO_DYNAMIC_ENABLED_PROPERTY =
- "persist.bluetooth.leaudio_switcher.enabled";
+ static final String LE_AUDIO_SWITCHER_DISABLED_PROPERTY =
+ "persist.bluetooth.leaudio_switcher.disabled";
private final DevelopmentSettingsDashboardFragment mFragment;
@@ -84,7 +84,7 @@
final boolean leAudioEnabled =
(isLeAudioSupportedStatus == BluetoothStatusCodes.FEATURE_SUPPORTED);
- ((SwitchPreference) mPreference).setChecked(leAudioEnabled);
+ ((SwitchPreference) mPreference).setChecked(!leAudioEnabled);
// Disable option if Bluetooth is disabled or if switch is not supported
if (isLeAudioSupportedStatus == BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED
@@ -101,10 +101,10 @@
return;
}
- final boolean leAudioEnabled =
- (mBluetoothAdapter.isLeAudioSupported() == BluetoothStatusCodes.FEATURE_SUPPORTED);
- SystemProperties.set(LE_AUDIO_DYNAMIC_ENABLED_PROPERTY,
- Boolean.toString(!leAudioEnabled));
+ final boolean leAudioDisabled =
+ (mBluetoothAdapter.isLeAudioSupported() != BluetoothStatusCodes.FEATURE_SUPPORTED);
+ SystemProperties.set(LE_AUDIO_SWITCHER_DISABLED_PROPERTY,
+ Boolean.toString(!leAudioDisabled));
}
/**
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothLeAudioPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothLeAudioPreferenceControllerTest.java
index 527fabb..2c4a023 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothLeAudioPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothLeAudioPreferenceControllerTest.java
@@ -17,7 +17,7 @@
package com.android.settings.development;
import static com.android.settings.development.BluetoothLeAudioPreferenceController
- .LE_AUDIO_DYNAMIC_ENABLED_PROPERTY;
+ .LE_AUDIO_SWITCHER_DISABLED_PROPERTY;
import static com.google.common.truth.Truth.assertThat;
@@ -75,8 +75,8 @@
mController.onRebootDialogConfirmed();
final boolean status = SystemProperties
- .getBoolean(LE_AUDIO_DYNAMIC_ENABLED_PROPERTY, false);
- assertThat(status).isTrue();
+ .getBoolean(LE_AUDIO_SWITCHER_DISABLED_PROPERTY, true);
+ assertThat(status).isFalse();
}
@Test
@@ -87,8 +87,8 @@
mController.onRebootDialogConfirmed();
final boolean status = SystemProperties
- .getBoolean(LE_AUDIO_DYNAMIC_ENABLED_PROPERTY, false);
- assertThat(status).isFalse();
+ .getBoolean(LE_AUDIO_SWITCHER_DISABLED_PROPERTY, true);
+ assertThat(status).isTrue();
}
@Test
@@ -99,7 +99,7 @@
mController.onRebootDialogCanceled();
final boolean status = SystemProperties
- .getBoolean(LE_AUDIO_DYNAMIC_ENABLED_PROPERTY, false);
- assertThat(status).isFalse();
+ .getBoolean(LE_AUDIO_SWITCHER_DISABLED_PROPERTY, true);
+ assertThat(status).isTrue();
}
}