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

Commit 3bd0631f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add connect / disconnect action when connect / disconnect to bluetooth device"

parents 469f4738 88496281

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

+11 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.bluetooth;



import android.app.settings.SettingsEnums;

import android.content.Context;



import androidx.preference.PreferenceFragmentCompat;
@@ -70,7 +71,11 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle 
                mActionButtons

                        .setButton2Text(R.string.bluetooth_device_context_disconnect)

                        .setButton2Icon(R.drawable.ic_settings_close)

                        .setButton2OnClickListener(view -> mCachedDevice.disconnect());

                        .setButton2OnClickListener(view -> {

                            mMetricsFeatureProvider.action(mContext,

                                    SettingsEnums.ACTION_SETTINGS_BLUETOOTH_DISCONNECT);

                            mCachedDevice.disconnect();

                        });

                mConnectButtonInitialized = true;

            }

        } else {
@@ -79,7 +84,11 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle 
                        .setButton2Text(R.string.bluetooth_device_context_connect)

                        .setButton2Icon(R.drawable.ic_add_24dp)

                        .setButton2OnClickListener(

                                view -> mCachedDevice.connect());

                                view -> {

                                    mMetricsFeatureProvider.action(mContext,

                                            SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT);

                                    mCachedDevice.connect();

                                });

                mConnectButtonInitialized = true;

            }

        }

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

+4 −0
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ import androidx.preference.PreferenceFragmentCompat; 
import androidx.preference.PreferenceScreen;



import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -40,6 +42,7 @@ public abstract class BluetoothDetailsController extends AbstractPreferenceContr 
    protected final Context mContext;

    protected final PreferenceFragmentCompat mFragment;

    protected final CachedBluetoothDevice mCachedDevice;

    protected final MetricsFeatureProvider mMetricsFeatureProvider;



    public BluetoothDetailsController(Context context, PreferenceFragmentCompat fragment,

            CachedBluetoothDevice device, Lifecycle lifecycle) {
@@ -48,6 +51,7 @@ public abstract class BluetoothDetailsController extends AbstractPreferenceContr 
        mFragment = fragment;

        mCachedDevice = device;

        lifecycle.addObserver(this);

        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();

    }



    @Override

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

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.settings.bluetooth;



import android.app.settings.SettingsEnums;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.content.Context;
@@ -116,6 +117,8 @@ public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater 
        if (device.isConnected()) {

            return device.setActive();

        }

        mMetricsFeatureProvider.action(mPrefContext,

                SettingsEnums.ACTION_SETTINGS_BLUETOOTH_CONNECT);

        device.connect();

        return true;

    }