From: Jason Monk <jmonk@google.com>
Date: Thu, 22 Feb 2018 21:33:51 +0000 (-0500)
Subject: Update to match now slice APIs
X-Git-Tag: android-x86-9.0-r1~86^2~7^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2d96005aba3a509fc801f9a05d61786d8ad78218;p=android-x86%2Fpackages-apps-Settings.git

Update to match now slice APIs

Test: make
Change-Id: Ie74e1b179f80e1d0faf259bd22b3ae4e953a0726
---

diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index 433bdf368b..d8ba991a14 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -35,6 +35,7 @@ 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;
 
 /**
@@ -173,8 +174,9 @@ public class SettingsSliceProvider extends SliceProvider {
                         .setTitle(getContext().getString(R.string.wifi_settings))
                         .setTitleItem(Icon.createWithResource(getContext(), R.drawable.wifi_signal))
                         .setSubtitle(state)
-                        .addToggle(getBroadcastIntent(ACTION_WIFI_CHANGED), finalWifiEnabled)
-                        .setContentIntent(getIntent(Intent.ACTION_MAIN)))
+                        .addEndItem(new SliceAction(getBroadcastIntent(ACTION_WIFI_CHANGED),
+                                null, finalWifiEnabled))
+                        .setPrimaryAction(new SliceAction(getIntent(Intent.ACTION_MAIN), null, null)))
                 .build();
     }
 
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index a01ea1bd0e..3df24edbeb 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -34,6 +34,7 @@ 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;
 
@@ -63,7 +64,7 @@ public class SliceBuilderUtils {
                 .setTitle(sliceData.getTitle())
                 .setTitleItem(icon)
                 .setSubtitle(subtitleText)
-                .setContentIntent(contentIntent);
+                .setPrimaryAction(new SliceAction(contentIntent, null, null));
 
         // TODO (b/71640747) Respect setting availability.
 
@@ -100,7 +101,7 @@ public class SliceBuilderUtils {
             String key) {
         PendingIntent actionIntent = getActionIntent(context,
                 SettingsSliceProvider.ACTION_TOGGLE_CHANGED, key);
-        builder.addToggle(actionIntent, isChecked);
+        builder.addEndItem(new SliceAction(actionIntent, null, isChecked));
     }
 
     private static PendingIntent getActionIntent(Context context, String action, String key) {