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

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

Merge "Fix battery level of earbuds bt devices is inconsistent" into sc-dev am: 6535fe00 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bc1403667f0c7c48bfb0838a2c6106d9b507963
parents 54619b5c 6535fe00

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

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ public final class BluetoothDevicePreference extends GearPreference { 
        mHideSecondTarget = hideSecondTarget;

    }



    private void onPreferenceAttributesChanged() {

    void onPreferenceAttributesChanged() {

        ThreadUtils.postOnBackgroundThread(() -> {

            final Pair<Drawable, String> pair =

                    BluetoothUtils.getBtRainbowDrawableWithDescription(getContext(), mCachedDevice);

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

+9 −0
Original line number Diff line number Diff line
@@ -317,4 +317,13 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback, 
        }

        return device.getBondState() == BluetoothDevice.BOND_BONDED && device.isConnected();

    }



    /**

     * Update the attributes of {@link Preference}.

     */

    public void refreshPreference() {

        for (Preference preference : mPreferenceMap.values()) {

            ((BluetoothDevicePreference) preference).onPreferenceAttributesChanged();

        }

    }

}

src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle 
        }

        mBluetoothDeviceUpdater.registerCallback();

        mLocalBluetoothManager.getEventManager().registerCallback(this);

        mBluetoothDeviceUpdater.refreshPreference();

    }



    @Override

src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class ConnectedDeviceGroupController extends BasePreferenceController 
        mBluetoothDeviceUpdater.registerCallback();

        mConnectedUsbDeviceUpdater.registerCallback();

        mConnectedDockUpdater.registerCallback();

        mBluetoothDeviceUpdater.refreshPreference();

    }



    @Override

src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc 
        mBluetoothDeviceUpdater.registerCallback();

        mSavedDockUpdater.registerCallback();

        mContext.registerReceiver(mReceiver, mIntentFilter);

        mBluetoothDeviceUpdater.refreshPreference();

    }



    @Override