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

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

Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3ade 

Change-Id: I1867ea8309ed5ec9e8bda40f68cd6e56c69b1755
parents 3d46b0e5 946e3ade

src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java

+6 −1
Original line number Diff line number Diff line
@@ -294,10 +294,15 @@ public class BluetoothDevicesSlice implements CustomSliceable { 
        final List<ListBuilder.RowBuilder> bluetoothRows = new ArrayList<>();

        // Create row builders based on paired devices.

        for (CachedBluetoothDevice device : getPairedBluetoothDevices()) {

            String summary = device.getConnectionSummary();

            if (summary == null) {

                summary = mContext.getString(

                        R.string.connected_device_previously_connected_screen_title);

            }

            final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()

                    .setTitleItem(getBluetoothDeviceIcon(device), ListBuilder.ICON_IMAGE)

                    .setTitle(device.getName())

                    .setSubtitle(device.getConnectionSummary());

                    .setSubtitle(summary);



            if (mAvailableMediaBtDeviceUpdater.isFilterMatched(device)

                    || mSavedBtDeviceUpdater.isFilterMatched(device)) {