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

Merge "Rename toggle "Enable Bluetooth LE audio" to "Disable Bluetooth LE audio"" am: 60d9be5a0a am: 7871a9e9bd am: 06bca85c6a am: 486691ad26 am: d951e2a048

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2516935

Change-Id: I3bf9d1a9e9a3da1938773139ea3f70316b61bde2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-31 11:01:06 +00:00
committed by Automerger Merge Worker
parent da3275ca95 d951e2a048
commit cb30e648a7
5 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -221,10 +221,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>

6
res/xml/development_settings.xml
View File

@@ -341,9 +341,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"

19
src/com/android/settings/development/BluetoothLeAudioAllowListPreferenceController.java
View File

@@ -44,12 +44,6 @@ public class BluetoothLeAudioAllowListPreferenceController
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 @@ public class BluetoothLeAudioAllowListPreferenceController
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);

16
src/com/android/settings/development/BluetoothLeAudioPreferenceController.java
View File

@@ -36,13 +36,13 @@ public class BluetoothLeAudioPreferenceController
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 @@ public class BluetoothLeAudioPreferenceController
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 @@ public class BluetoothLeAudioPreferenceController
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));
}
/**

14
tests/robotests/src/com/android/settings/development/BluetoothLeAudioPreferenceControllerTest.java
View File

@@ -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 @@ public class BluetoothLeAudioPreferenceControllerTest {
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 @@ public class BluetoothLeAudioPreferenceControllerTest {
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 @@ public class BluetoothLeAudioPreferenceControllerTest {
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();
}
}