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

Commit 20b82c36 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f1144 

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



Change-Id: I3536f29c771b9233790e6852ab6dc4cb0b58b531
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3b58bc9 1f9f1144

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

+3 −1
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll 
    private static final String ENABLE_DUAL_MODE_AUDIO =

            "persist.bluetooth.enable_dual_mode_audio";

    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 = false;



    private LocalBluetoothManager mManager;

    private LocalBluetoothProfileManager mProfileManager;
@@ -444,7 +445,8 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll 
                SettingsUIDeviceConfig.BT_LE_AUDIO_CONTACT_SHARING_ENABLED, true);

        boolean isLeDeviceDetailEnabled = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SETTINGS_UI,

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, true);

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED,

                LE_AUDIO_DEVICE_DETAIL_DEFAULT_VALUE);

        boolean isLeEnabledByDefault = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                CONFIG_LE_AUDIO_ENABLED_BY_DEFAULT, false);

        mIsLeAudioToggleEnabled = isLeDeviceDetailEnabled || isLeEnabledByDefault;

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +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;

    private static final boolean LE_AUDIO_DEVICE_DETAIL_DEFAULT_VALUE = false;

    static int sLeAudioSupportedStateCache = BluetoothStatusCodes.ERROR_UNKNOWN;



    @VisibleForTesting