diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java index b0d69630a0f..5271e128502 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java @@ -16,8 +16,6 @@ package com.android.settings.homepage.contextualcards.deviceinfo; -import static com.android.settings.slices.CustomSliceRegistry.BATTERY_INFO_SLICE_URI; - import android.app.PendingIntent; import android.content.Context; import android.content.Intent; @@ -37,6 +35,7 @@ import com.android.settings.SubSettings; import com.android.settings.Utils; import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.PowerUsageSummary; +import com.android.settings.slices.CustomSliceRegistry; import com.android.settings.slices.CustomSliceable; import com.android.settings.slices.SliceBuilderUtils; @@ -66,7 +65,8 @@ public class BatterySlice implements CustomSliceable { final CharSequence title = mContext.getText(R.string.power_usage_summary_title); final SliceAction primarySliceAction = SliceAction.createDeeplink(getPrimaryAction(), icon, ListBuilder.ICON_IMAGE, title); - final Slice slice = new ListBuilder(mContext, BATTERY_INFO_SLICE_URI, ListBuilder.INFINITY) + final Slice slice = new ListBuilder(mContext, CustomSliceRegistry.BATTERY_INFO_SLICE_URI, + ListBuilder.INFINITY) .setAccentColor(Utils.getColorAccentDefaultColor(mContext)) .setHeader(new ListBuilder.HeaderBuilder().setTitle(title)) .addRow(new ListBuilder.RowBuilder() @@ -81,7 +81,7 @@ public class BatterySlice implements CustomSliceable { @Override public Uri getUri() { - return BATTERY_INFO_SLICE_URI; + return CustomSliceRegistry.BATTERY_INFO_SLICE_URI; } @Override @@ -95,7 +95,8 @@ public class BatterySlice implements CustomSliceable { return SliceBuilderUtils.buildSearchResultPageIntent(mContext, PowerUsageSummary.class.getName(), "" /* key */, screenTitle, MetricsProto.MetricsEvent.SLICE) - .setClassName(mContext.getPackageName(), SubSettings.class.getName()); + .setClassName(mContext.getPackageName(), SubSettings.class.getName()) + .setData(CustomSliceRegistry.BATTERY_INFO_SLICE_URI); } @Override diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java index bb7858633d0..6e94f6dd80c 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java @@ -94,7 +94,8 @@ public class DataUsageSlice implements CustomSliceable { return SliceBuilderUtils.buildSearchResultPageIntent(mContext, DataUsageSummary.class.getName(), "" /* key */, screenTitle, MetricsProto.MetricsEvent.SLICE) - .setClassName(mContext.getPackageName(), SubSettings.class.getName()); + .setClassName(mContext.getPackageName(), SubSettings.class.getName()) + .setData(CustomSliceRegistry.DATA_USAGE_SLICE_URI); } private PendingIntent getPrimaryAction() { diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java index 694336d19ca..1f75ab14e17 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java @@ -85,7 +85,8 @@ public class DeviceInfoSlice implements CustomSliceable { return SliceBuilderUtils.buildSearchResultPageIntent(mContext, MyDeviceInfoFragment.class.getName(), "" /* key */, screenTitle, MetricsProto.MetricsEvent.SLICE) - .setClassName(mContext.getPackageName(), SubSettings.class.getName()); + .setClassName(mContext.getPackageName(), SubSettings.class.getName()) + .setData(CustomSliceRegistry.DEVICE_INFO_SLICE_URI); } private PendingIntent getPrimaryAction() { diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java index eba831ac23b..799a7019d64 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java @@ -80,7 +80,8 @@ public class StorageSlice implements CustomSliceable { return SliceBuilderUtils.buildSearchResultPageIntent(mContext, StorageDashboardFragment.class.getName(), "" /* key */, screenTitle, MetricsProto.MetricsEvent.SLICE) - .setClassName(mContext.getPackageName(), SubSettings.class.getName()); + .setClassName(mContext.getPackageName(), SubSettings.class.getName()) + .setData(CustomSliceRegistry.STORAGE_SLICE_URI); } private PendingIntent getPrimaryAction() { diff --git a/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java b/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java index 0c79b6b37d5..d6cb42e516e 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java @@ -147,7 +147,8 @@ public class ConnectedDeviceSlice implements CustomSliceable { ConnectedDeviceDashboardFragment.class.getName(), "" /* key */, screenTitle, MetricsProto.MetricsEvent.SLICE) - .setClassName(mContext.getPackageName(), SubSettings.class.getName()); + .setClassName(mContext.getPackageName(), SubSettings.class.getName()) + .setData(CustomSliceRegistry.CONNECTED_DEVICE_SLICE_URI); } @Override diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java index 3cbbb0c98f8..e0f31165c5f 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java @@ -110,7 +110,8 @@ public class LowStorageSlice implements CustomSliceable { StorageSettings.class.getName(), "" /* key */, screenTitle, MetricsProto.MetricsEvent.SLICE) - .setClassName(mContext.getPackageName(), SubSettings.class.getName()); + .setClassName(mContext.getPackageName(), SubSettings.class.getName()) + .setData(CustomSliceRegistry.LOW_STORAGE_SLICE_URI); } private RowBuilder buildRowBuilder(CharSequence title, String summary, IconCompat icon) {