Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details am: f05615f1e8 (636eb36d) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+7 −4

Original line number	Diff line number	Diff line
		@@ -221,14 +221,17 @@
		<!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
		<string name="bluetooth_disable_hw_offload_dialog_cancel">Cancel</string>

		<!-- Setting Checkbox title for disabling Bluetooth LE Audio feature. [CHAR LIMIT=40] -->
		<!-- Setting toggle 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]-->
		<!-- Summary of toggle 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] -->
		<!-- Setting toggle title for enabling Bluetooth LE Audio toggle in Device Details. [CHAR LIMIT=40] -->
		<string name="bluetooth_show_leaudio_device_details">Show LE audio toggle in Device Details</string>

		<!-- Setting toggle 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>
		<!-- Summary of checkbox for enabling Bluetooth LE audio Allow List [CHAR LIMIT=none]-->
		<!-- Summary of toggle for enabling Bluetooth LE audio Allow List [CHAR LIMIT=none]-->
		<string name="bluetooth_enable_leaudio_allow_list_summary">Enable Bluetooth LE audio allow list feature.</string>

		<!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->

res/xml/development_settings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -350,6 +350,10 @@
		android:title="@string/bluetooth_disable_leaudio"
		android:summary="@string/bluetooth_disable_leaudio_summary" />

		<SwitchPreference
		android:key="bluetooth_show_leaudio_device_details"
		android:title="@string/bluetooth_show_leaudio_device_details"/>

		<SwitchPreference
		android:key="bluetooth_enable_leaudio_allow_list"
		android:title="@string/bluetooth_enable_leaudio_allow_list"

src/com/android/settings/core/SettingsUIDeviceConfig.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -42,4 +42,9 @@ public class SettingsUIDeviceConfig {
		* {@code true} whether or not event_log for generic actions is enabled. Default is true.
		*/
		public static final String GENERIC_EVENT_LOGGING_ENABLED = "event_logging_enabled";
		/**
		* {@code true} whether to show LE Audio toggle in device detail page. Default is false.
		*/
		public static final String BT_LE_AUDIO_DEVICE_DETAIL_ENABLED =
		"bt_le_audio_device_detail_enabled";
		}

src/com/android/settings/development/BluetoothLeAudioDeviceDetailsPreferenceController.java

0 → 100644

+102 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.development;

		import android.bluetooth.BluetoothAdapter;
		import android.bluetooth.BluetoothManager;
		import android.bluetooth.BluetoothStatusCodes;
		import android.content.Context;
		import android.provider.DeviceConfig;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		import androidx.preference.SwitchPreference;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.core.SettingsUIDeviceConfig;
		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

		/**
		* Preference controller to control whether display Bluetooth LE audio toggle in device detail
		* settings page or not.
		*/
		public class BluetoothLeAudioDeviceDetailsPreferenceController
		extends DeveloperOptionsPreferenceController
		implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

		private static final String PREFERENCE_KEY = "bluetooth_show_leaudio_device_details";
		static int sLeAudioSupportedStateCache = BluetoothStatusCodes.ERROR_UNKNOWN;

		@VisibleForTesting
		BluetoothAdapter mBluetoothAdapter;

		public BluetoothLeAudioDeviceDetailsPreferenceController(Context context) {
		super(context);
		mBluetoothAdapter = context.getSystemService(BluetoothManager.class).getAdapter();
		}

		@Override
		public String getPreferenceKey() {
		return PREFERENCE_KEY;
		}

		@Override
		public boolean isAvailable() {
		if (sLeAudioSupportedStateCache == BluetoothStatusCodes.ERROR_UNKNOWN
		&& mBluetoothAdapter != null) {
		int isLeAudioSupported = mBluetoothAdapter.isLeAudioSupported();
		if (isLeAudioSupported != BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED) {
		sLeAudioSupportedStateCache = isLeAudioSupported;
		}
		}

		// Display the option only if LE Audio is supported
		return (sLeAudioSupportedStateCache == BluetoothStatusCodes.FEATURE_SUPPORTED);
		}

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean isEnabled = (Boolean) newValue;
		DeviceConfig.setProperty(
		DeviceConfig.NAMESPACE_SETTINGS_UI,
		SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED,
		isEnabled ? "true" : "false", false);
		return true;
		}

		@Override
		public void updateState(Preference preference) {
		if (!isAvailable()) {
		return;
		}

		final boolean leAudioDeviceDetailEnabled = DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_SETTINGS_UI,
		SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, false);

		((SwitchPreference) mPreference).setChecked(leAudioDeviceDetailEnabled);
		}

		@Override
		protected void onDeveloperOptionsSwitchDisabled() {
		super.onDeveloperOptionsSwitchDisabled();
		// Reset the toggle to null when the developer option is disabled
		DeviceConfig.setProperty(
		DeviceConfig.NAMESPACE_SETTINGS_UI,
		SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, "null", false);
		}
		}

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -660,6 +660,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
		controllers.add(new BluetoothMapVersionPreferenceController(context));
		controllers.add(new BluetoothLeAudioPreferenceController(context, fragment));
		controllers.add(new BluetoothLeAudioDeviceDetailsPreferenceController(context));
		controllers.add(new BluetoothLeAudioAllowListPreferenceController(context, fragment));
		controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
		controllers.add(new BluetoothLeAudioHwOffloadPreferenceController(context, fragment));