Merge "Fix battery level of earbuds bt devices is inconsistent" into sc-dev

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

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

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

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

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

@@ -111,6 +111,7 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc
         mBluetoothDeviceUpdater.registerCallback();
         mSavedDockUpdater.registerCallback();
         mContext.registerReceiver(mReceiver, mIntentFilter);
+        mBluetoothDeviceUpdater.refreshPreference();
     }
 
     @Override

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

@@ -63,6 +63,7 @@ public class SavedDeviceGroupController extends BasePreferenceController
     public void onStart() {
         mBluetoothDeviceUpdater.registerCallback();
         mSavedDockUpdater.registerCallback();
+        mBluetoothDeviceUpdater.refreshPreference();
     }
 
     @Override