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

Commit 38438a97 authored by Kunhung Li's avatar Kunhung Li
Browse files

Rename the Utils class in settingslib.bluetooth 

Make it more unique to speficy related bluetooth, so change class name from Utils to BluetoothUtils.

Bug: 78676509
Test: atest RunSettingsRoboTests
Change-Id: Ic3627ce44627be39fbc010ad5ef630ad3c429836
parent 1ae09fe2

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

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.settings.R; 
import com.android.settings.applications.LayoutPreference;

import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.BluetoothUtils;

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

import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;

import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -59,7 +60,7 @@ public class BluetoothDetailsHeaderController extends BluetoothDetailsController 
    }



    protected void setHeaderProperties() {

        final Pair<Drawable, String> pair = com.android.settingslib.bluetooth.Utils

        final Pair<Drawable, String> pair = BluetoothUtils

                .getBtClassDrawableWithDescription(mContext, mCachedDevice,

                mContext.getResources().getFraction(R.fraction.bt_battery_scale_fraction, 1, 1));

        String summaryText = mCachedDevice.getConnectionSummary();

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

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import com.android.settings.R; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.GearPreference;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.BluetoothUtils;

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



import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
@@ -128,7 +129,7 @@ public final class BluetoothDevicePreference extends GearPreference implements 
        // Null check is done at the framework

        setSummary(mCachedDevice.getConnectionSummary());



        final Pair<Drawable, String> pair = com.android.settingslib.bluetooth.Utils

        final Pair<Drawable, String> pair = BluetoothUtils

                .getBtClassDrawableWithDescription(getContext(), mCachedDevice);

        if (pair.first != null) {

            setIcon(pair.first);

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

+5 −4
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ import com.android.settings.R; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.bluetooth.LocalBluetoothManager.BluetoothManagerCallback;

import com.android.settingslib.bluetooth.Utils.ErrorListener;

import com.android.settingslib.bluetooth.BluetoothUtils;

import com.android.settingslib.bluetooth.BluetoothUtils.ErrorListener;



/**

 * Utils is a helper class that contains constants for various
@@ -38,8 +39,8 @@ import com.android.settingslib.bluetooth.Utils.ErrorListener; 
 * for creating dialogs.

 */

public final class Utils {

    static final boolean V = com.android.settingslib.bluetooth.Utils.V; // verbose logging

    static final boolean D =  com.android.settingslib.bluetooth.Utils.D;  // regular logging

    static final boolean V = BluetoothUtils.V; // verbose logging

    static final boolean D =  BluetoothUtils.D;  // regular logging



    private Utils() {

    }
@@ -139,7 +140,7 @@ public final class Utils { 
        @Override

        public void onBluetoothManagerInitialized(Context appContext,

                LocalBluetoothManager bluetoothManager) {

            com.android.settingslib.bluetooth.Utils.setErrorListener(mErrorListener);

            BluetoothUtils.setErrorListener(mErrorListener);

        }

    };