PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Follow slice refactor"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-12 18:17:26 +00:00
committed by Android (Google) Code Review
parent 194085f5c5 5ef0a604a9
commit 77a2fb8339
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -79,7 +79,7 @@ public class SettingsSliceProvider extends SliceProvider {
} }
private Slice getHoldingSlice(Uri uri) { private Slice getHoldingSlice(Uri uri) {
return new ListBuilder(uri).build(); return new ListBuilder(getContext(), uri).build();
} }
// TODO (b/70622039) remove this when the proper wifi slice is enabled. // TODO (b/70622039) remove this when the proper wifi slice is enabled.
@@ -106,7 +106,7 @@ public class SettingsSliceProvider extends SliceProvider {
} }
boolean finalWifiEnabled = wifiEnabled; boolean finalWifiEnabled = wifiEnabled;
return new ListBuilder(sliceUri) return new ListBuilder(getContext(), sliceUri)
.setColor(R.color.material_blue_500) .setColor(R.color.material_blue_500)
.addRow(b -> b .addRow(b -> b
.setTitle(getContext().getString(R.string.wifi_settings)) .setTitle(getContext().getString(R.string.wifi_settings))

4
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -59,7 +59,7 @@ public class SliceBuilderUtils {
? sliceData.getScreenTitle() ? sliceData.getScreenTitle()
: summaryText; : summaryText;
RowBuilder builder = new RowBuilder(sliceData.getUri()) RowBuilder builder = new RowBuilder(context, sliceData.getUri())
.setTitle(sliceData.getTitle()) .setTitle(sliceData.getTitle())
.setTitleItem(icon) .setTitleItem(icon)
.setSubtitle(subtitleText) .setSubtitle(subtitleText)
@@ -75,7 +75,7 @@ public class SliceBuilderUtils {
sliceData.getKey()); sliceData.getKey());
} }
return new ListBuilder(sliceData.getUri()) return new ListBuilder(context, sliceData.getUri())
.addRow(builder) .addRow(builder)
.build(); .build();
} }