From 80c806abd60f8d8381f6654fd2f708f5d915f0bf Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Tue, 27 Feb 2018 20:12:57 +0000
Subject: [PATCH] Revert "Update to match now slice APIs"

This reverts commit 2d96005aba3a509fc801f9a05d61786d8ad78218.

Reason for revert: prebuilt revert

Bug: 73903252
Bug: 73876473
Bug: 73875529
Bug: 73866916
Change-Id: I5d47a7c5ddebc16c1c508f5bb48ace809cbaf273
---
 src/com/android/settings/slices/SettingsSliceProvider.java | 6 ++----
 src/com/android/settings/slices/SliceBuilderUtils.java     | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index d8ba991a145..433bdf368bd 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -35,7 +35,6 @@ import java.util.WeakHashMap;
 
 import androidx.app.slice.Slice;
 import androidx.app.slice.SliceProvider;
-import androidx.app.slice.builders.SliceAction;
 import androidx.app.slice.builders.ListBuilder;
 
 /**
@@ -174,9 +173,8 @@ public class SettingsSliceProvider extends SliceProvider {
                         .setTitle(getContext().getString(R.string.wifi_settings))
                         .setTitleItem(Icon.createWithResource(getContext(), R.drawable.wifi_signal))
                         .setSubtitle(state)
-                        .addEndItem(new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED),
-                                null, finalWifiEnabled))
-                        .setPrimaryAction(new SliceAction(getIntent(Intent.ACTION_MAIN), null, null)))
+                        .addToggle(getBroadcastIntent(ACTION_WIFI_CHANGED), finalWifiEnabled)
+                        .setContentIntent(getIntent(Intent.ACTION_MAIN)))
                 .build();
     }
 
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index 3df24edbeb1..a01ea1bd0ed 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -34,7 +34,6 @@ import com.android.settings.search.DatabaseIndexingUtils;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import androidx.app.slice.Slice;
-import androidx.app.slice.builders.SliceAction;
 import androidx.app.slice.builders.ListBuilder;
 import androidx.app.slice.builders.ListBuilder.RowBuilder;
 
@@ -64,7 +63,7 @@ public class SliceBuilderUtils {
                 .setTitle(sliceData.getTitle())
                 .setTitleItem(icon)
                 .setSubtitle(subtitleText)
-                .setPrimaryAction(new SliceAction(contentIntent, null, null));
+                .setContentIntent(contentIntent);
 
         // TODO (b/71640747) Respect setting availability.
 
@@ -101,7 +100,7 @@ public class SliceBuilderUtils {
             String key) {
         PendingIntent actionIntent = getActionIntent(context,
                 SettingsSliceProvider.ACTION_TOGGLE_CHANGED, key);
-        builder.addEndItem(new SliceAction(actionIntent, null, isChecked));
+        builder.addToggle(actionIntent, isChecked);
     }
 
     private static PendingIntent getActionIntent(Context context, String action, String key) {