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 am: 946e3adeda am: 3ba40628fc am: 742dd6f60c

Browse Source 
Change-Id: Ia5e40b1a8df8f8d59881e0ec5d11e71178db6004
This commit is contained in:
TreeHugger Robot
2020-05-20 15:02:49 +00:00
committed by Automerger Merge Worker
parent 47b98dd082 742dd6f60c
commit cf1486003e
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<>();
// 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)) {