Merge "Show subtext for previously connected devices on BT card" into rvc-dev... (ba98f11c) · Commits · e / os / android_packages_apps_Settings

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)) {