Merge "Update the icon in BluetoothDevicesSlice"

This commit is contained in:
Yanting Yang
2019-01-04 14:04:27 +00:00
committed by Android (Google) Code Review

View File

@@ -273,7 +273,7 @@ public class BluetoothDevicesSlice implements CustomSliceable {
private SliceAction buildBluetoothDetailDeepLinkAction(CachedBluetoothDevice bluetoothDevice) { private SliceAction buildBluetoothDetailDeepLinkAction(CachedBluetoothDevice bluetoothDevice) {
return SliceAction.createDeeplink( return SliceAction.createDeeplink(
getBluetoothDetailIntent(bluetoothDevice), getBluetoothDetailIntent(bluetoothDevice),
IconCompat.createWithResource(mContext, R.drawable.ic_settings), IconCompat.createWithResource(mContext, R.drawable.ic_settings_24dp),
ListBuilder.ICON_IMAGE, ListBuilder.ICON_IMAGE,
bluetoothDevice.getName()); bluetoothDevice.getName());
} }
@@ -287,9 +287,7 @@ public class BluetoothDevicesSlice implements CustomSliceable {
final CharSequence title = mContext.getText(R.string.bluetooth_pairing_pref_title); final CharSequence title = mContext.getText(R.string.bluetooth_pairing_pref_title);
final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_menu_add); final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_menu_add);
final SliceAction sliceAction = SliceAction.createDeeplink( final SliceAction sliceAction = SliceAction.createDeeplink(
getPairNewDeviceIntent(), getPairNewDeviceIntent(), icon, ListBuilder.ICON_IMAGE, title);
IconCompat.createWithResource(mContext, R.drawable.ic_settings),
ListBuilder.ICON_IMAGE, title);
return new ListBuilder.RowBuilder() return new ListBuilder.RowBuilder()
.setTitleItem(icon, ListBuilder.ICON_IMAGE) .setTitleItem(icon, ListBuilder.ICON_IMAGE)