Add Icon at the start of the first row for all contextualcards
- set Icon as a title item rather than an end item in slice builders - call showTitleItems in renderer Test: robotest Bug: 119639527 Change-Id: I043173968ceb3d34e38c2e43ad824b923e647d47
This commit is contained in:
@@ -98,10 +98,10 @@ public class BatteryFixSlice implements CustomSliceable {
|
|||||||
ListBuilder.ICON_IMAGE,
|
ListBuilder.ICON_IMAGE,
|
||||||
batteryTip.getTitle(mContext));
|
batteryTip.getTitle(mContext));
|
||||||
sliceBuilder.addRow(new RowBuilder()
|
sliceBuilder.addRow(new RowBuilder()
|
||||||
|
.setTitleItem(icon, ListBuilder.ICON_IMAGE)
|
||||||
.setTitle(batteryTip.getTitle(mContext))
|
.setTitle(batteryTip.getTitle(mContext))
|
||||||
.setSubtitle(batteryTip.getSummary(mContext))
|
.setSubtitle(batteryTip.getSummary(mContext))
|
||||||
.setPrimaryAction(primaryAction)
|
.setPrimaryAction(primaryAction));
|
||||||
.addEndItem(icon, ListBuilder.ICON_IMAGE));
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -144,9 +144,9 @@ public class BatteryFixSlice implements CustomSliceable {
|
|||||||
final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon,
|
final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon,
|
||||||
ListBuilder.ICON_IMAGE, title);
|
ListBuilder.ICON_IMAGE, title);
|
||||||
sliceBuilder.addRow(new RowBuilder()
|
sliceBuilder.addRow(new RowBuilder()
|
||||||
|
.setTitleItem(icon, ListBuilder.ICON_IMAGE)
|
||||||
.setTitle(title)
|
.setTitle(title)
|
||||||
.setPrimaryAction(primaryAction)
|
.setPrimaryAction(primaryAction))
|
||||||
.addEndItem(icon, ListBuilder.ICON_IMAGE))
|
|
||||||
.setIsError(isError);
|
.setIsError(isError);
|
||||||
return sliceBuilder.build();
|
return sliceBuilder.build();
|
||||||
}
|
}
|
||||||
|
@@ -119,15 +119,10 @@ public class LowStorageSlice implements CustomSliceable {
|
|||||||
PendingIntent.getActivity(mContext, 0, getIntent(), 0), icon,
|
PendingIntent.getActivity(mContext, 0, getIntent(), 0), icon,
|
||||||
ListBuilder.ICON_IMAGE, title);
|
ListBuilder.ICON_IMAGE, title);
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO(b/114808204): Contextual Home Page - "Low Storage"
|
|
||||||
* Slices doesn't support "Icon on the left" in header. Now we intend to start with Icon
|
|
||||||
* right aligned. Will update the icon to left until Slices support it.
|
|
||||||
*/
|
|
||||||
return new RowBuilder()
|
return new RowBuilder()
|
||||||
|
.setTitleItem(icon, ListBuilder.ICON_IMAGE)
|
||||||
.setTitle(title)
|
.setTitle(title)
|
||||||
.setSubtitle(summary)
|
.setSubtitle(summary)
|
||||||
.addEndItem(icon, ListBuilder.ICON_IMAGE)
|
|
||||||
.setPrimaryAction(primarySliceAction);
|
.setPrimaryAction(primarySliceAction);
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -132,6 +132,7 @@ public class SliceContextualCardRenderer implements ContextualCardRenderer,
|
|||||||
cardHolder.sliceView.setOnSliceActionListener(this);
|
cardHolder.sliceView.setOnSliceActionListener(this);
|
||||||
|
|
||||||
// Customize slice view for Settings
|
// Customize slice view for Settings
|
||||||
|
cardHolder.sliceView.showTitleItems(true);
|
||||||
if (card.isLargeCard()) {
|
if (card.isLargeCard()) {
|
||||||
cardHolder.sliceView.showHeaderDivider(true);
|
cardHolder.sliceView.showHeaderDivider(true);
|
||||||
cardHolder.sliceView.showActionDividers(true);
|
cardHolder.sliceView.showActionDividers(true);
|
||||||
|
Reference in New Issue
Block a user