Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aac69512 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Default show LE audio toggle in Device Detail" into udc-d1-dev am: df23aab9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23486040



Change-Id: I5202aa1f9202a906ef197a0f60209edf73df7ab5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 800256a4 df23aab9

src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll 
        mIsLeContactSharingEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,

                SettingsUIDeviceConfig.BT_LE_AUDIO_CONTACT_SHARING_ENABLED, true);

        mIsLeAudioToggleEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, false)

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, true)

                || DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                CONFIG_LE_AUDIO_ENABLED_BY_DEFAULT, false);

        // Call refresh here even though it will get called later in onResume, to avoid the

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

+6 −3
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public class BluetoothLeAudioDeviceDetailsPreferenceController 


    private static final String PREFERENCE_KEY = "bluetooth_show_leaudio_device_details";

    private static final String CONFIG_LE_AUDIO_ENABLED_BY_DEFAULT = "le_audio_enabled_by_default";

    private static final boolean LE_AUDIO_DEVICE_DETAIL_DEFAULT_VALUE = true;

    static int sLeAudioSupportedStateCache = BluetoothStatusCodes.ERROR_UNKNOWN;



    @VisibleForTesting
@@ -75,7 +76,7 @@ public class BluetoothLeAudioDeviceDetailsPreferenceController 
        DeviceConfig.setProperty(

                DeviceConfig.NAMESPACE_SETTINGS_UI,

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED,

                isEnabled ? "true" : "false", false);

                isEnabled ? "true" : "false", LE_AUDIO_DEVICE_DETAIL_DEFAULT_VALUE);

        return true;

    }
@@ -87,7 +88,8 @@ public class BluetoothLeAudioDeviceDetailsPreferenceController 


        final boolean leAudioDeviceDetailEnabled = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SETTINGS_UI,

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, false);

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED,

                LE_AUDIO_DEVICE_DETAIL_DEFAULT_VALUE);

        final boolean leAudioEnabledByDefault = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_BLUETOOTH, CONFIG_LE_AUDIO_ENABLED_BY_DEFAULT, false);
@@ -102,6 +104,7 @@ public class BluetoothLeAudioDeviceDetailsPreferenceController 
        // 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);

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, "null",

                LE_AUDIO_DEVICE_DETAIL_DEFAULT_VALUE);

    }

}