diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java index 41c27575fd1..ab1b4c90327 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java @@ -98,10 +98,10 @@ public class BatteryFixSlice implements CustomSliceable { ListBuilder.ICON_IMAGE, batteryTip.getTitle(mContext)); sliceBuilder.addRow(new RowBuilder() + .setTitleItem(icon, ListBuilder.ICON_IMAGE) .setTitle(batteryTip.getTitle(mContext)) .setSubtitle(batteryTip.getSummary(mContext)) - .setPrimaryAction(primaryAction) - .addEndItem(icon, ListBuilder.ICON_IMAGE)); + .setPrimaryAction(primaryAction)); break; } } @@ -144,9 +144,9 @@ public class BatteryFixSlice implements CustomSliceable { final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon, ListBuilder.ICON_IMAGE, title); sliceBuilder.addRow(new RowBuilder() + .setTitleItem(icon, ListBuilder.ICON_IMAGE) .setTitle(title) - .setPrimaryAction(primaryAction) - .addEndItem(icon, ListBuilder.ICON_IMAGE)) + .setPrimaryAction(primaryAction)) .setIsError(isError); return sliceBuilder.build(); } diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java index e0f31165c5f..03e430160b3 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java @@ -119,15 +119,10 @@ public class LowStorageSlice implements CustomSliceable { PendingIntent.getActivity(mContext, 0, getIntent(), 0), icon, 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() + .setTitleItem(icon, ListBuilder.ICON_IMAGE) .setTitle(title) .setSubtitle(summary) - .addEndItem(icon, ListBuilder.ICON_IMAGE) .setPrimaryAction(primarySliceAction); } } \ No newline at end of file diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java index 17e9d483785..3bacd346ac2 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java +++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java @@ -132,6 +132,7 @@ public class SliceContextualCardRenderer implements ContextualCardRenderer, cardHolder.sliceView.setOnSliceActionListener(this); // Customize slice view for Settings + cardHolder.sliceView.showTitleItems(true); if (card.isLargeCard()) { cardHolder.sliceView.showHeaderDivider(true); cardHolder.sliceView.showActionDividers(true);