PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show subtext for previously connected devices on BT card" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-20 14:10:31 +00:00
committed by Android (Google) Code Review
parent a75dddbf9f 07767907d5
commit 946e3adeda
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
View File

@@ -294,10 +294,15 @@ public class BluetoothDevicesSlice implements CustomSliceable {
final List<ListBuilder.RowBuilder> bluetoothRows = new ArrayList<>(); final List<ListBuilder.RowBuilder> bluetoothRows = new ArrayList<>();
// Create row builders based on paired devices. // Create row builders based on paired devices.
for (CachedBluetoothDevice device : getPairedBluetoothDevices()) { 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() final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
.setTitleItem(getBluetoothDeviceIcon(device), ListBuilder.ICON_IMAGE) .setTitleItem(getBluetoothDeviceIcon(device), ListBuilder.ICON_IMAGE)
.setTitle(device.getName()) .setTitle(device.getName())
.setSubtitle(device.getConnectionSummary()); .setSubtitle(summary);
if (mAvailableMediaBtDeviceUpdater.isFilterMatched(device) if (mAvailableMediaBtDeviceUpdater.isFilterMatched(device)
|| mSavedBtDeviceUpdater.isFilterMatched(device)) { || mSavedBtDeviceUpdater.isFilterMatched(device)) {