Replace SliceAction deprecated method

- Replace new SliceAction with SliceAction.createDeeplink() or
SliceAction.create()

Test: make RunSettingsRoboTests
Change-Id: Ied34469d2220d8220a2dcc6c2fb4d32dd9cd9b8c
Fixes: 119879284

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 primarySliceAction = SliceAction.createDeeplink(primaryAction, icon,
-        final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */,
+                ListBuilder.ICON_IMAGE, title);
-                isBluetoothEnabled);
+        final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction,
+                null /* actionTitle */, isBluetoothEnabled);
 
         return new ListBuilder(context, CustomSliceRegistry.BLUETOOTH_URI, ListBuilder.INFINITY)
                 .setAccentColor(color)

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();
     }
 

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))

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 =

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)))

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));
     }
 }

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)

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))

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,
+        final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryActionIntent, icon,
-                title);
+                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());
     }
 

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(
+        final SliceAction primarySliceAction = SliceAction.createDeeplink(
-                PendingIntent.getActivity(mContext, 0, getIntent(), 0), icon, title);
+                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));

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)

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(
+                        .setPrimaryAction(
-                                getActivityIntent(ACTION_MOBILE_NETWORK_SETTINGS_ACTIVITY),
+                                SliceAction.createDeeplink(
-                                icon,
+                                        getActivityIntent(ACTION_MOBILE_NETWORK_SETTINGS_ACTIVITY),
-                                getEnhanced4glteModeTitle(subId))))
+                                        icon,
+                                        ListBuilder.ICON_IMAGE,
+                                        getEnhanced4glteModeTitle(subId))))
                 .build();
     }
 

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,
+        final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction,
-                (IconCompat) null /* icon */, title);
+                (IconCompat) null /* icon */, ListBuilder.ICON_IMAGE, title);
-        final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */,
+        final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction, null /* actionTitle */,
                 isZenModeEnabled);
 
         return new ListBuilder(context, CustomSliceRegistry.ZEN_MODE_SLICE_URI,

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,
+        final SliceAction primaryAction = SliceAction.createDeeplink(contentIntent, icon,
-                sliceData.getTitle());
+                ListBuilder.ICON_IMAGE, sliceData.getTitle());
         final Set<String> 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),
+        final SliceAction primaryAction = SliceAction.createDeeplink(
-                icon, title);
+                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)

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 primarySliceAction = SliceAction.createDeeplink(primaryAction, icon,
-        final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */,
+                ListBuilder.ICON_IMAGE, title);
-                isWifiEnabled);
+        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(
+                .setPrimaryAction(SliceAction.create(
-                        getAccessPointAction(accessPoint), levelIcon, title));
+                        getAccessPointAction(accessPoint), levelIcon, ListBuilder.ICON_IMAGE,
+                        title));
 
         final IconCompat endIcon = getEndIcon(accessPoint);
         if (endIcon != null) {

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(
+                        .setPrimaryAction(SliceAction.createDeeplink(
-                                primaryActionIntent, icon,
+                                primaryActionIntent, icon, ListBuilder.SMALL_IMAGE,
                                 title)))
                 .build();
     }