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

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

Merge "LEA developer option is enabled if the BT LEA flag is enabled" into... 

Merge "LEA developer option is enabled if the BT LEA flag is enabled" into udc-dev am: 6814775f am: ee1c8683

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



Change-Id: Iad877e0d98a647c8c90bb1d440d7c9eb7f922fdc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b12ebe2b ee1c8683

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

+4 −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 LocalBluetoothManager mManager;

    private LocalBluetoothProfileManager mProfileManager;
@@ -99,7 +100,9 @@ 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, false)

                || 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

        // list of switches appearing to "pop" into the page.

        refresh();

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

+6 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ public class BluetoothLeAudioDeviceDetailsPreferenceController 
        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {



    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";

    static int sLeAudioSupportedStateCache = BluetoothStatusCodes.ERROR_UNKNOWN;



    @VisibleForTesting
@@ -87,8 +88,12 @@ public class BluetoothLeAudioDeviceDetailsPreferenceController 
        final boolean leAudioDeviceDetailEnabled = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SETTINGS_UI,

                SettingsUIDeviceConfig.BT_LE_AUDIO_DEVICE_DETAIL_ENABLED, false);

        final boolean leAudioEnabledByDefault = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_BLUETOOTH, CONFIG_LE_AUDIO_ENABLED_BY_DEFAULT, false);



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

        mPreference.setEnabled(!leAudioEnabledByDefault);

        ((SwitchPreference) mPreference).setChecked(leAudioDeviceDetailEnabled

                || leAudioEnabledByDefault);

    }



    @Override