diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java index 0a2e8ceb7fa..67e8b1985f5 100644 --- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java +++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java @@ -78,9 +78,10 @@ public class BluetoothSliceBuilder { context).getDefaultColor(); final PendingIntent toggleAction = getBroadcastIntent(context); final PendingIntent primaryAction = getPrimaryAction(context); - final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title); - final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */, - isBluetoothEnabled); + final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon, + ListBuilder.ICON_IMAGE, title); + final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction, + null /* actionTitle */, isBluetoothEnabled); return new ListBuilder(context, CustomSliceRegistry.BLUETOOTH_URI, ListBuilder.INFINITY) .setAccentColor(color) diff --git a/src/com/android/settings/flashlight/FlashlightSliceBuilder.java b/src/com/android/settings/flashlight/FlashlightSliceBuilder.java index 57d99ef530f..5833229a546 100644 --- a/src/com/android/settings/flashlight/FlashlightSliceBuilder.java +++ b/src/com/android/settings/flashlight/FlashlightSliceBuilder.java @@ -83,7 +83,7 @@ public class FlashlightSliceBuilder { .setTitle(context.getText(R.string.power_flashlight)) .setTitleItem(icon, ICON_IMAGE) .setPrimaryAction( - new SliceAction(toggleAction, null, isFlashlightEnabled(context)))) + SliceAction.createToggle(toggleAction, null, isFlashlightEnabled(context)))) .build(); } diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java index 222e9dd3bfc..b0d69630a0f 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java @@ -64,7 +64,8 @@ public class BatterySlice implements CustomSliceable { final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_settings_battery); final CharSequence title = mContext.getText(R.string.power_usage_summary_title); - final SliceAction primarySliceAction = new SliceAction(getPrimaryAction(), icon, title); + final SliceAction primarySliceAction = SliceAction.createDeeplink(getPrimaryAction(), icon, + ListBuilder.ICON_IMAGE, title); final Slice slice = new ListBuilder(mContext, BATTERY_INFO_SLICE_URI, ListBuilder.INFINITY) .setAccentColor(Utils.getColorAccentDefaultColor(mContext)) .setHeader(new ListBuilder.HeaderBuilder().setTitle(title)) diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java index 9be4b6125c9..bb7858633d0 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java @@ -66,7 +66,8 @@ public class DataUsageSlice implements CustomSliceable { final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_settings_data_usage); final String title = mContext.getString(R.string.data_usage_summary_title); - final SliceAction primaryAction = new SliceAction(getPrimaryAction(), icon, title); + final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon, + ListBuilder.ICON_IMAGE, title); final DataUsageController dataUsageController = new DataUsageController(mContext); final DataUsageController.DataUsageInfo info = dataUsageController.getDataUsageInfo(); final ListBuilder listBuilder = diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java index b7c662e8e6e..694336d19ca 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java @@ -61,7 +61,8 @@ public class DeviceInfoSlice implements CustomSliceable { final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_info_outline_24dp); final String title = mContext.getString(R.string.device_info_label); - final SliceAction primaryAction = new SliceAction(getPrimaryAction(), icon, title); + final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon, + ListBuilder.ICON_IMAGE, title); return new ListBuilder(mContext, CustomSliceRegistry.DEVICE_INFO_SLICE_URI, ListBuilder.INFINITY) .setAccentColor((Utils.getColorAccentDefaultColor(mContext))) diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java index dfadc722aa0..2484e53b18f 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java @@ -54,10 +54,10 @@ public class EmergencyInfoSlice { new Intent(ACTION_EDIT_EMERGENCY_INFO), PendingIntent.FLAG_UPDATE_CURRENT); - return SliceAction.create( + return SliceAction.createDeeplink( pendingIntent, IconCompat.createWithResource(context, R.drawable.empty_icon), - ListBuilder.SMALL_IMAGE, + ListBuilder.ICON_IMAGE, context.getText(R.string.emergency_info_title)); } } diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java index 1e07f7a38cc..eba831ac23b 100644 --- a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java @@ -60,7 +60,8 @@ public class StorageSlice implements CustomSliceable { final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_homepage_storage); final String title = mContext.getString(R.string.storage_label); - final SliceAction primaryAction = new SliceAction(getPrimaryAction(), icon, title); + final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon, + ListBuilder.ICON_IMAGE, title); final PrivateStorageInfo info = getPrivateStorageInfo(); return new ListBuilder(mContext, CustomSliceRegistry.STORAGE_SLICE_URI, ListBuilder.INFINITY) diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java index cae222a4916..403178c0788 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java @@ -88,8 +88,9 @@ public class BatteryFixSlice implements CustomSliceable { for (BatteryTip batteryTip : batteryTips) { if (batteryTip.getState() != BatteryTip.StateType.INVISIBLE) { icon = IconCompat.createWithResource(mContext, batteryTip.getIconId()); - primaryAction = new SliceAction(getPrimaryAction(), + primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon, + ListBuilder.ICON_IMAGE, batteryTip.getTitle(mContext)); slice = new ListBuilder(mContext, CustomSliceRegistry.BATTERY_FIX_SLICE_URI, ListBuilder.INFINITY) @@ -107,7 +108,8 @@ public class BatteryFixSlice implements CustomSliceable { icon = IconCompat.createWithResource(mContext, R.drawable.ic_battery_status_good_24dp); final String title = mContext.getString(R.string.power_usage_summary_title); - primaryAction = new SliceAction(getPrimaryAction(), icon, title); + primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon, + ListBuilder.ICON_IMAGE, title); slice = new ListBuilder(mContext, CustomSliceRegistry.BATTERY_FIX_SLICE_URI, ListBuilder.INFINITY) .setAccentColor(Utils.getColorAccentDefaultColor(mContext)) diff --git a/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java b/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java index fe907f342a8..6a1f1f0520a 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java @@ -106,8 +106,8 @@ public class ConnectedDeviceSlice implements CustomSliceable { R.string.no_connected_devices); final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext, 0, getIntent(), 0); - final SliceAction primarySliceAction = new SliceAction(primaryActionIntent, icon, - title); + final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryActionIntent, icon, + ListBuilder.ICON_IMAGE, title); final ListBuilder listBuilder = new ListBuilder(mContext, CustomSliceRegistry.CONNECTED_DEVICE_SLICE_URI, ListBuilder.INFINITY) @@ -232,9 +232,10 @@ public class ConnectedDeviceSlice implements CustomSliceable { } private SliceAction buildBluetoothDetailDeepLinkAction(CachedBluetoothDevice bluetoothDevice) { - return new SliceAction( + return SliceAction.createDeeplink( getBluetoothDetailIntent(bluetoothDevice), IconCompat.createWithResource(mContext, R.drawable.ic_settings), + ListBuilder.ICON_IMAGE, bluetoothDevice.getName()); } diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java index b3b0b0abb37..d893587d7f9 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java @@ -79,8 +79,9 @@ public class LowStorageSlice implements CustomSliceable { // Show Low storage Slice. final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.ic_storage); final CharSequence title = mContext.getText(R.string.storage_menu_free); - final SliceAction primarySliceAction = new SliceAction( - PendingIntent.getActivity(mContext, 0, getIntent(), 0), icon, title); + final SliceAction primarySliceAction = SliceAction.createDeeplink( + PendingIntent.getActivity(mContext, 0, getIntent(), 0), icon, + ListBuilder.ICON_IMAGE, title); final String lowStorageSummary = mContext.getString(R.string.low_storage_summary, NumberFormat.getPercentInstance().format(currentStoragePercentage), Formatter.formatFileSize(mContext, info.freeBytes)); diff --git a/src/com/android/settings/location/LocationSliceBuilder.java b/src/com/android/settings/location/LocationSliceBuilder.java index 1d79ada8c6b..f70d09b27b7 100644 --- a/src/com/android/settings/location/LocationSliceBuilder.java +++ b/src/com/android/settings/location/LocationSliceBuilder.java @@ -57,7 +57,8 @@ public class LocationSliceBuilder { final String title = context.getString(R.string.location_settings_title); @ColorInt final int color = Utils.getColorAccentDefaultColor(context); final PendingIntent primaryAction = getPrimaryAction(context); - final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title); + final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon, + ListBuilder.ICON_IMAGE, title); return new ListBuilder(context, CustomSliceRegistry.LOCATION_SLICE_URI, ListBuilder.INFINITY) diff --git a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java index aff1211d326..be5d94866e2 100644 --- a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java +++ b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java @@ -92,7 +92,7 @@ public class Enhanced4gLteSliceHelper { * Enhanced 4g lte mode title variant resource name */ private static final String RESOURCE_ENHANCED_4G_LTE_MODE_TITLE_VARIANT = - "enhanced_4g_lte_mode_title_variant"; + "enhanced_4g_lte_mode_title_variant"; @VisibleForTesting public Enhanced4gLteSliceHelper(Context context) { @@ -172,13 +172,15 @@ public class Enhanced4gLteSliceHelper { .addRow(new RowBuilder() .setTitle(getEnhanced4glteModeTitle(subId)) .addEndItem( - new SliceAction( + SliceAction.createToggle( getBroadcastIntent(ACTION_ENHANCED_4G_LTE_CHANGED), null /* actionTitle */, isEnhanced4gLteEnabled)) - .setPrimaryAction(new SliceAction( - getActivityIntent(ACTION_MOBILE_NETWORK_SETTINGS_ACTIVITY), - icon, - getEnhanced4glteModeTitle(subId)))) + .setPrimaryAction( + SliceAction.createDeeplink( + getActivityIntent(ACTION_MOBILE_NETWORK_SETTINGS_ACTIVITY), + icon, + ListBuilder.ICON_IMAGE, + getEnhanced4glteModeTitle(subId)))) .build(); } diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java index f5208c14187..5c88fb66bb0 100644 --- a/src/com/android/settings/notification/ZenModeSliceBuilder.java +++ b/src/com/android/settings/notification/ZenModeSliceBuilder.java @@ -76,9 +76,9 @@ public class ZenModeSliceBuilder { @ColorInt final int color = Utils.getColorAccentDefaultColor(context); final PendingIntent toggleAction = getBroadcastIntent(context); final PendingIntent primaryAction = getPrimaryAction(context); - final SliceAction primarySliceAction = new SliceAction(primaryAction, - (IconCompat) null /* icon */, title); - final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */, + final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, + (IconCompat) null /* icon */, ListBuilder.ICON_IMAGE, title); + final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction, null /* actionTitle */, isZenModeEnabled); return new ListBuilder(context, CustomSliceRegistry.ZEN_MODE_SLICE_URI, diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index f18225ade27..76eefac9b1f 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -279,7 +279,8 @@ public class SliceBuilderUtils { .setTitle(sliceData.getTitle()) .setSubtitle(subtitleText) .setPrimaryAction( - new SliceAction(contentIntent, icon, sliceData.getTitle())) + SliceAction.createDeeplink(contentIntent, icon, + ListBuilder.ICON_IMAGE, sliceData.getTitle())) .addEndItem(sliceAction)) .setKeywords(keywords) .build(); @@ -299,7 +300,9 @@ public class SliceBuilderUtils { .setTitle(sliceData.getTitle()) .setSubtitle(subtitleText) .setPrimaryAction( - new SliceAction(contentIntent, icon, sliceData.getTitle()))) + SliceAction.createDeeplink(contentIntent, icon, + ListBuilder.ICON_IMAGE, + sliceData.getTitle()))) .setKeywords(keywords) .build(); } @@ -312,8 +315,8 @@ public class SliceBuilderUtils { final IconCompat icon = getSafeIcon(context, sliceData); @ColorInt final int color = Utils.getColorAccentDefaultColor(context); final CharSequence subtitleText = getSubtitleText(context, controller, sliceData); - final SliceAction primaryAction = new SliceAction(contentIntent, icon, - sliceData.getTitle()); + final SliceAction primaryAction = SliceAction.createDeeplink(contentIntent, icon, + ListBuilder.ICON_IMAGE, sliceData.getTitle()); final Set keywords = buildSliceKeywords(sliceData); return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY) @@ -334,7 +337,8 @@ public class SliceBuilderUtils { final SliceAction copyableAction = getCopyableAction(context, sliceData); final PendingIntent contentIntent = getContentPendingIntent(context, sliceData); final IconCompat icon = getSafeIcon(context, sliceData); - final SliceAction primaryAction = new SliceAction(contentIntent, icon, + final SliceAction primaryAction = SliceAction.createDeeplink(contentIntent, icon, + ListBuilder.ICON_IMAGE, sliceData.getTitle()); final CharSequence subtitleText = getSubtitleText(context, controller, sliceData); @ColorInt final int color = Utils.getColorAccentDefaultColor(context); @@ -366,7 +370,7 @@ public class SliceBuilderUtils { boolean isChecked) { PendingIntent actionIntent = getActionIntent(context, SettingsSliceProvider.ACTION_TOGGLE_CHANGED, sliceData); - return new SliceAction(actionIntent, null, isChecked); + return SliceAction.createToggle(actionIntent, null, isChecked); } private static PendingIntent getSliderAction(Context context, SliceData sliceData) { @@ -378,7 +382,7 @@ public class SliceBuilderUtils { SettingsSliceProvider.ACTION_COPY, sliceData); final IconCompat icon = IconCompat.createWithResource(context, R.drawable.ic_content_copy_grey600_24dp); - return new SliceAction(intent, icon, sliceData.getTitle()); + return SliceAction.create(intent, icon, ListBuilder.ICON_IMAGE, sliceData.getTitle()); } private static boolean isValidSummary(Context context, CharSequence summary) { @@ -421,14 +425,15 @@ public class SliceBuilderUtils { @ColorInt final int color = Utils.getColorAccentDefaultColor(context); final CharSequence summary = context.getText(R.string.disabled_dependent_setting_summary); final IconCompat icon = getSafeIcon(context, data); - final SliceAction primaryAction = new SliceAction(getContentPendingIntent(context, data), - icon, title); + final SliceAction primaryAction = SliceAction.createDeeplink( + getContentPendingIntent(context, data), + icon, ListBuilder.ICON_IMAGE, title); return new ListBuilder(context, data.getUri(), ListBuilder.INFINITY) .setAccentColor(color) .addRow(new RowBuilder() .setTitle(title) - .setTitleItem(icon, ListBuilder.SMALL_IMAGE) + .setTitleItem(icon, ListBuilder.ICON_IMAGE) .setSubtitle(summary) .setPrimaryAction(primaryAction)) .setKeywords(keywords) diff --git a/src/com/android/settings/wifi/WifiSlice.java b/src/com/android/settings/wifi/WifiSlice.java index 0dbbfd53289..2382abb2873 100644 --- a/src/com/android/settings/wifi/WifiSlice.java +++ b/src/com/android/settings/wifi/WifiSlice.java @@ -92,9 +92,10 @@ public class WifiSlice implements CustomSliceable { @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext); final PendingIntent toggleAction = getBroadcastIntent(mContext); final PendingIntent primaryAction = getPrimaryAction(); - final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title); - final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */, - isWifiEnabled); + final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction, icon, + ListBuilder.ICON_IMAGE, title); + final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction, + null /* actionTitle */, isWifiEnabled); final ListBuilder listBuilder = new ListBuilder(mContext, WIFI_SLICE_URI, ListBuilder.INFINITY) @@ -139,8 +140,9 @@ public class WifiSlice implements CustomSliceable { .setSubtitle(!TextUtils.isEmpty(apSummary) ? apSummary : mContext.getText(R.string.summary_placeholder)) - .setPrimaryAction(new SliceAction( - getAccessPointAction(accessPoint), levelIcon, title)); + .setPrimaryAction(SliceAction.create( + getAccessPointAction(accessPoint), levelIcon, ListBuilder.ICON_IMAGE, + title)); final IconCompat endIcon = getEndIcon(accessPoint); if (endIcon != null) { diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java index 65012fc340e..70eef2cc575 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java @@ -194,12 +194,13 @@ public class WifiCallingSliceHelper { .addRow(new RowBuilder() .setTitle(mContext.getText(R.string.wifi_calling_settings_title)) .addEndItem( - new SliceAction( + SliceAction.createToggle( getBroadcastIntent(ACTION_WIFI_CALLING_CHANGED), null /* actionTitle */, isWifiCallingEnabled)) - .setPrimaryAction(new SliceAction( + .setPrimaryAction(SliceAction.createDeeplink( getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY), icon, + ListBuilder.ICON_IMAGE, mContext.getText(R.string.wifi_calling_settings_title)))) .build(); } @@ -283,9 +284,10 @@ public class WifiCallingSliceHelper { listBuilder.setHeader(new ListBuilder.HeaderBuilder() .setTitle(mContext.getText(R.string.wifi_calling_mode_title)) .setSubtitle(getWifiCallingPreferenceSummary(currentWfcPref)) - .setPrimaryAction(new SliceAction( + .setPrimaryAction(SliceAction.createDeeplink( getActivityIntent(ACTION_WIFI_CALLING_SETTINGS_ACTIVITY), icon, + ListBuilder.ICON_IMAGE, mContext.getText(R.string.wifi_calling_mode_title)))); if (isWifiOnlySupported) { @@ -322,7 +324,7 @@ public class WifiCallingSliceHelper { IconCompat.createWithResource(mContext, R.drawable.radio_button_check); return new RowBuilder() .setTitle(mContext.getText(preferenceTitleResId)) - .setTitleItem(new SliceAction(getBroadcastIntent(action), + .setTitleItem(SliceAction.createToggle(getBroadcastIntent(action), icon, mContext.getText(preferenceTitleResId), checked)); } @@ -470,8 +472,8 @@ public class WifiCallingSliceHelper { .addRow(new RowBuilder() .setTitle(title) .setSubtitle(subtitle) - .setPrimaryAction(new SliceAction( - primaryActionIntent, icon, + .setPrimaryAction(SliceAction.createDeeplink( + primaryActionIntent, icon, ListBuilder.SMALL_IMAGE, title))) .build(); }