From 05fcb0d7842f632acfe76432eb6c27b220d39caa Mon Sep 17 00:00:00 2001
From: Douglas Sigelbaum <sigelbaum@google.com>
Date: Tue, 10 Jul 2018 13:27:22 -0700
Subject: [PATCH] Update slice API usage to alpha4/beta01.

---
 build.gradle                                  |   2 +-
 slice/build.gradle                            |   6 +-
 slice/src/main/AndroidManifest.xml            |   4 +
 .../java/GettingStartedSliceProvider.java     | 122 ++++---
 .../android/slice/java/MySliceProvider.java   | 305 ++++++++++--------
 .../kotlin/GettingStartedSliceProvider.kt     |  59 ++--
 .../android/slice/kotlin/MySliceProvider.kt   |  75 ++---
 7 files changed, 325 insertions(+), 248 deletions(-)

diff --git a/build.gradle b/build.gradle
index b45b5489f..42e70d2c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha18'
+        classpath 'com.android.tools.build:gradle:3.2.0-beta02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/slice/build.gradle b/slice/build.gradle
index 1febd8b02..9152c3d20 100644
--- a/slice/build.gradle
+++ b/slice/build.gradle
@@ -32,8 +32,8 @@ dependencies {
     implementation project(':shared')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha3"
-    implementation "androidx.appcompat:appcompat:1.0.0-alpha3"
-    implementation "androidx.cardview:cardview:1.0.0-alpha3"
+    implementation "androidx.slice:slice-builders-ktx:1.0.0-alpha4"
+    implementation "androidx.appcompat:appcompat:1.0.0-beta01"
+    implementation "androidx.cardview:cardview:1.0.0-beta01"
     testImplementation 'junit:junit:4.12'
 }
diff --git a/slice/src/main/AndroidManifest.xml b/slice/src/main/AndroidManifest.xml
index 622d64bdd..39030a6c7 100644
--- a/slice/src/main/AndroidManifest.xml
+++ b/slice/src/main/AndroidManifest.xml
@@ -26,6 +26,7 @@
             <intent-filter>
                 <action android:name="androidx.intent.SLICE_ACTION"/>
                 <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.app.slice.category.SLICE"/>
                 <data
                     android:host="slice.android.example.com"
                     android:pathPrefix="/"
@@ -39,6 +40,7 @@
             <intent-filter>
                 <action android:name="androidx.intent.SLICE_ACTION"/>
                 <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.app.slice.category.SLICE"/>
                 <data
                     android:host="slice.android.example.com"
                     android:pathPrefix="/"
@@ -52,6 +54,7 @@
             <intent-filter>
                 <action android:name="androidx.intent.SLICE_ACTION"/>
                 <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.app.slice.category.SLICE"/>
                 <data
                     android:host="slice.android.example.com"
                     android:pathPrefix="/"
@@ -65,6 +68,7 @@
             <intent-filter>
                 <action android:name="androidx.intent.SLICE_ACTION"/>
                 <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.app.slice.category.SLICE"/>
                 <data
                     android:host="slice.android.example.com"
                     android:pathPrefix="/"
diff --git a/slice/src/main/java/com/example/android/slice/java/GettingStartedSliceProvider.java b/slice/src/main/java/com/example/android/slice/java/GettingStartedSliceProvider.java
index ca8199811..f7aeda241 100644
--- a/slice/src/main/java/com/example/android/slice/java/GettingStartedSliceProvider.java
+++ b/slice/src/main/java/com/example/android/slice/java/GettingStartedSliceProvider.java
@@ -40,65 +40,78 @@ public boolean onCreateSliceProvider() {
     // [START on_bind_slice]
     @Override
     public Slice onBindSlice(Uri sliceUri) {
-        // Create parent ListBuilder.
+        if (getContext() == null) {
+            return null;
+        }
+        SliceAction activityAction = createActivityAction();
         ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY);
-
-        // Create RowBuilder.
-        ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder(listBuilder);
-
-        if (sliceUri.getPath().equals("/hello")) {
-            rowBuilder.setTitle("URI found.");
+        // Create parent ListBuilder.
+        if ("/hello".equals(sliceUri.getPath())) {
+            listBuilder.addRow(new ListBuilder.RowBuilder()
+                    .setTitle("Hello World")
+                    .setPrimaryAction(activityAction)
+            );
         } else {
-            rowBuilder.setTitle("URI not found.");
+            listBuilder.addRow(new ListBuilder.RowBuilder()
+                    .setTitle("URI not recognized")
+                    .setPrimaryAction(activityAction)
+            );
         }
-
-        // Add Row to List.
-        listBuilder.addRow(rowBuilder);
-
-        // Build List.
         return listBuilder.build();
     }
     // [END on_bind_slice]
 
     // [START create_slice]
     public Slice createSlice(Uri sliceUri) {
+        if (getContext() == null) {
+            return null;
+        }
         SliceAction activityAction = createActivityAction();
-        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY);
-        ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder(listBuilder)
-                .setTitle("Perform action in app.")
-                .setPrimaryAction(activityAction);
-        listBuilder.addRow(rowBuilder);
-        return listBuilder.build();
+        return new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY)
+                .addRow(new ListBuilder.RowBuilder()
+                        .setTitle("Perform action in app.")
+                        .setPrimaryAction(activityAction)
+                ).build();
     }
 
     public SliceAction createActivityAction() {
-        Intent intent = new Intent(getContext(), MainActivity.class);
-        return new SliceAction(PendingIntent.getActivity(getContext(), 0, intent, 0),
+        if (getContext() == null) {
+            return null;
+        }
+        return SliceAction.create(
+                PendingIntent.getActivity(
+                        getContext(),
+                        0,
+                        new Intent(getContext(), MainActivity.class),
+                        0
+                ),
                 IconCompat.createWithResource(getContext(), R.drawable.ic_home),
-                "Open MainActivity");
+                ListBuilder.ICON_IMAGE,
+                "Enter app"
+        );
     }
     // [END create_slice]
 
     // [START create_brightness_slice]
     public Slice createBrightnessSlice(Uri sliceUri) {
-        SliceAction toggleAction = new SliceAction(createToggleIntent(),
-                "Toggle adaptive brightness", true);
-        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY);
-        ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder(listBuilder)
-                .setTitle("Adaptive brightness")
-                .setSubtitle("Optimizes brightness for available light.")
-                .setPrimaryAction(toggleAction);
-
-        listBuilder.addRow(rowBuilder);
-
-        ListBuilder.InputRangeBuilder inputRangeBuilder = new ListBuilder.InputRangeBuilder(
-                listBuilder)
-                .setInputAction(brightnessPendingIntent)
-                .setMax(100)
-                .setValue(45);
-
-        listBuilder.addInputRange(inputRangeBuilder);
-
+        if (getContext() == null) {
+            return null;
+        }
+        SliceAction toggleAction = SliceAction.createToggle(
+                createToggleIntent(),
+                "Toggle adaptive brightness",
+                true
+        );
+        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY)
+                .addRow(new ListBuilder.RowBuilder()
+                        .setTitle("Adaptive brightness")
+                        .setSubtitle("Optimizes brightness for available light.")
+                        .setPrimaryAction(toggleAction)
+                ).addInputRange(new ListBuilder.InputRangeBuilder()
+                        .setInputAction(brightnessPendingIntent)
+                        .setMax(100)
+                        .setValue(45)
+                );
         return listBuilder.build();
     }
 
@@ -110,20 +123,31 @@ public PendingIntent createToggleIntent() {
 
     // [START create_dynamic_slice]
     public Slice createDynamicSlice(Uri sliceUri) {
+        if (getContext() == null || sliceUri.getPath() == null) {
+            return null;
+        }
         ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY);
-        ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder(listBuilder);
         switch (sliceUri.getPath()) {
             case "/count":
-                SliceAction toastAndIncrementAction = new SliceAction(createToastAndIncrementIntent(
-                        "Item clicked."), actionIcon, "Increment.");
-                rowBuilder.setPrimaryAction(toastAndIncrementAction)
-                        .setTitle("Count: " + MyBroadcastReceiver.sReceivedCount)
-                        .setSubtitle("Click me");
-                listBuilder.addRow(rowBuilder);
+                SliceAction toastAndIncrementAction = SliceAction.create(
+                        createToastAndIncrementIntent("Item clicked."),
+                        actionIcon,
+                        ListBuilder.ICON_IMAGE,
+                        "Increment."
+                );
+                listBuilder.addRow(
+                        new ListBuilder.RowBuilder()
+                                .setPrimaryAction(toastAndIncrementAction)
+                                .setTitle("Count: " + MyBroadcastReceiver.sReceivedCount)
+                                .setSubtitle("Click me")
+                );
                 break;
             default:
-                rowBuilder.setTitle("URI not found.");
-                listBuilder.addRow(rowBuilder);
+                listBuilder.addRow(
+                        new ListBuilder.RowBuilder()
+                                .setPrimaryAction(createActivityAction())
+                                .setTitle("URI not found.")
+                );
                 break;
         }
         return listBuilder.build();
diff --git a/slice/src/main/java/com/example/android/slice/java/MySliceProvider.java b/slice/src/main/java/com/example/android/slice/java/MySliceProvider.java
index d086a91d0..f26fd4ce5 100644
--- a/slice/src/main/java/com/example/android/slice/java/MySliceProvider.java
+++ b/slice/src/main/java/com/example/android/slice/java/MySliceProvider.java
@@ -15,6 +15,7 @@
 package com.example.android.slice.java;
 
 import android.app.PendingIntent;
+import android.content.Intent;
 import android.net.Uri;
 
 import com.example.android.snippets.R;
@@ -23,8 +24,10 @@
 import androidx.slice.Slice;
 import androidx.slice.SliceProvider;
 import androidx.slice.builders.GridRowBuilder;
+import androidx.slice.builders.GridRowBuilder.CellBuilder;
 import androidx.slice.builders.ListBuilder;
 import androidx.slice.builders.ListBuilder.HeaderBuilder;
+import androidx.slice.builders.ListBuilder.InputRangeBuilder;
 import androidx.slice.builders.ListBuilder.RowBuilder;
 import androidx.slice.builders.SliceAction;
 import androidx.slice.core.SliceHints;
@@ -63,99 +66,95 @@ public Slice onBindSlice(Uri sliceUri) {
 
     // [START create_slice_with_header]
     public Slice createSliceWithHeader(Uri sliceUri) {
+        if (getContext() == null) {
+            return null;
+        }
+
         // Construct the parent.
         ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY)
-                .setAccentColor(0xff0F9D58); // Specify color for tinting icons.
-
-        // Create the header.
-        HeaderBuilder headerBuilder = new HeaderBuilder(listBuilder)
-                .setTitle("Get a ride")
-                .setSubtitle("Ride in 4 min.")
-                .setSummary("Work in 1 hour 45 min | Home in 12 min.");
-
-        // Add it to the list.
-        listBuilder.setHeader(headerBuilder);
-
-        // Construct the rows.
-        RowBuilder rowBuilder = new RowBuilder(listBuilder)
-                .setTitle("Home")
-                .setSubtitle("12 miles | 12 min | $9.00")
-                .addEndItem(IconCompat.createWithResource(getContext(), R.drawable.ic_home),
-                        SliceHints.ICON_IMAGE);
-
-        listBuilder.addRow(rowBuilder);
-
-        // Add more rows if needed...
-
+                .setAccentColor(0xff0F9D58) // Specify color for tinting icons.
+                .setHeader( // Create the header and add to slice.
+                        new HeaderBuilder()
+                                .setTitle("Get a ride")
+                                .setSubtitle("Ride in 4 min.")
+                                .setSummary("Work in 1 hour 45 min | Home in 12 min.")
+                ).addRow(new RowBuilder() // Add a row.
+                        .setPrimaryAction(
+                                createActivityAction()) // A slice always needs a SliceAction.
+                        .setTitle("Home")
+                        .setSubtitle("12 miles | 12 min | $9.00")
+                        .addEndItem(IconCompat.createWithResource(getContext(), R.drawable.ic_home),
+                                SliceHints.ICON_IMAGE)
+                ); // Add more rows if needed...
         return listBuilder.build();
     }
     // [END create_slice_with_header]
 
     // [START create_slice_with_action_in_header]
     public Slice createSliceWithActionInHeader(Uri sliceUri) {
-
-        // Construct the list.
-        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY)
-                .setAccentColor(0xfff4b400); // Specify color for tinting icons
-
-        // Construct the header.
-        HeaderBuilder headerBuilder = new HeaderBuilder(listBuilder)
-                .setTitle("Create new note")
-                .setSubtitle("Easily done with this note taking app");
-
+        if (getContext() == null) {
+            return null;
+        }
         // Construct our slice actions.
-        SliceAction noteAction = new SliceAction(takeNoteIntent,
+        SliceAction noteAction = SliceAction.create(takeNoteIntent,
                 IconCompat.createWithResource(getContext(), R.drawable.ic_pencil),
                 ListBuilder.ICON_IMAGE, "Take note");
 
-        SliceAction voiceNoteAction = new SliceAction(voiceNoteIntent,
+        SliceAction voiceNoteAction = SliceAction.create(voiceNoteIntent,
                 IconCompat.createWithResource(getContext(), R.drawable.ic_mic),
                 ListBuilder.ICON_IMAGE,
                 "Take voice note");
 
-        SliceAction cameraNoteAction = new SliceAction(cameraNoteIntent,
+        SliceAction cameraNoteAction = SliceAction.create(cameraNoteIntent,
                 IconCompat.createWithResource(getContext(), R.drawable.ic_camera),
                 ListBuilder.ICON_IMAGE,
                 "Create photo note");
 
-        // Set the header.
-        listBuilder.setHeader(headerBuilder);
-
-        // Add the actions to the list builder.
-        listBuilder.addAction(noteAction);
-        listBuilder.addAction(voiceNoteAction);
-        listBuilder.addAction(cameraNoteAction);
 
+        // Construct the list.
+        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY)
+                .setAccentColor(0xfff4b400) // Specify color for tinting icons
+                .setHeader(new HeaderBuilder() // Construct the header.
+                        .setTitle("Create new note")
+                        .setSubtitle("Easily done with this note taking app")
+                )
+                .addRow(new RowBuilder()
+                        .setTitle("Enter app")
+                        .setPrimaryAction(createActivityAction())
+                )
+                // Add the actions to the ListBuilder.
+                .addAction(noteAction)
+                .addAction(voiceNoteAction)
+                .addAction(cameraNoteAction);
         return listBuilder.build();
     }
     // [END create_slice_with_action_in_header]
 
     // [START create_action_with_action_in_row]
     public Slice createActionWithActionInRow(Uri sliceUri) {
+        if (getContext() == null) {
+            return null;
+        }
         // Primary action - open wifi settings.
-        SliceAction primaryAction = new SliceAction(wifiSettingsPendingIntent,
+        SliceAction primaryAction = SliceAction.create(wifiSettingsPendingIntent,
                 IconCompat.createWithResource(getContext(), R.drawable.ic_wifi),
-                "Wi-Fi Settings");
+                ListBuilder.ICON_IMAGE,
+                "Wi-Fi Settings"
+        );
 
         // Toggle action - toggle wifi.
-        SliceAction toggleAction = new SliceAction(wifiTogglePendingIntent,
+        SliceAction toggleAction = SliceAction.createToggle(wifiTogglePendingIntent,
                 "Toggle Wi-Fi", isConnected /* isChecked */);
 
         // Create the parent builder.
-        ListBuilder listBuilder = new ListBuilder(getContext(), wifiUri, ListBuilder.INFINITY);
-
-        // Specify color for tinting icons / controls.
-        listBuilder.setAccentColor(0xff4285f4);
-
-        // Create the row.
-        RowBuilder rowBuilder = new RowBuilder(listBuilder)
-                .setTitle("Wi-Fi")
-                .setPrimaryAction(primaryAction)
-                .addEndItem(toggleAction);
-
-        // Add the row.
-        listBuilder.addRow(rowBuilder);
-
+        ListBuilder listBuilder = new ListBuilder(getContext(), wifiUri, ListBuilder.INFINITY)
+                // Specify color for tinting icons / controls.
+                .setAccentColor(0xff4285f4)
+                // Create and add a row.
+                .addRow(new RowBuilder()
+                        .setTitle("Wi-Fi")
+                        .setPrimaryAction(primaryAction)
+                        .addEndItem(toggleAction));
         // Build the slice.
         return listBuilder.build();
     }
@@ -163,96 +162,118 @@ public Slice createActionWithActionInRow(Uri sliceUri) {
 
     // [START create_slice_with_gridrow]
     public Slice createSliceWithGridRow(Uri sliceUri) {
+        if (getContext() == null) {
+            return null;
+        }
         // Create the parent builder.
-        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY);
-
-        // Create the header.
-        HeaderBuilder hb = new HeaderBuilder(listBuilder);
-        hb.setTitle("Famous restaurants");
-        hb.setPrimaryAction(new SliceAction(pendingIntent, icon, "Famous restaurants"));
-        listBuilder.setHeader(hb);
-
-        // Create the grid.
-        GridRowBuilder gb = new GridRowBuilder(listBuilder);
-
-        // Create the cells.
-        GridRowBuilder.CellBuilder cell1 = new GridRowBuilder.CellBuilder(gb)
-                .addImage(image1, ListBuilder.LARGE_IMAGE)
-                .addTitleText("Top Restaurant")
-                .addText("0.3 mil")
-                .setContentIntent(intent1);
-        GridRowBuilder.CellBuilder cell2 = new GridRowBuilder.CellBuilder(gb)
-                .addImage(image2, ListBuilder.LARGE_IMAGE)
-                .addTitleText("Fast and Casual")
-                .addText("0.5 mil")
-                .setContentIntent(intent2);
-        GridRowBuilder.CellBuilder cell3 = new GridRowBuilder.CellBuilder(gb)
-                .addImage(image3, ListBuilder.LARGE_IMAGE)
-                .addTitleText("Casual Diner")
-                .addText("0.9 mi")
-                .setContentIntent(intent3);
-        GridRowBuilder.CellBuilder cell4 = new GridRowBuilder.CellBuilder(gb)
-                .addImage(image4, ListBuilder.LARGE_IMAGE)
-                .addTitleText("Ramen Spot")
-                .addText("1.2 mi")
-                .setContentIntent(intent4);
-
-        // Add cells to the grid.
-        gb.addCell(cell1).addCell(cell2).addCell(cell3).addCell(cell4);
-
-        // Add the grid to the list.
-        listBuilder.addGridRow(gb);
-
+        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY)
+                .setHeader(
+                        // Create the header.
+                        new HeaderBuilder()
+                                .setTitle("Famous restaurants")
+                                .setPrimaryAction(SliceAction
+                                        .create(pendingIntent, icon, ListBuilder.ICON_IMAGE,
+                                                "Famous restaurants"))
+                )
+                // Add a grid row to the list.
+                .addGridRow(new GridRowBuilder()
+                        // Add cells to the grid row.
+                        .addCell(new CellBuilder()
+                                .addImage(image1, ListBuilder.LARGE_IMAGE)
+                                .addTitleText("Top Restaurant")
+                                .addText("0.3 mil")
+                                .setContentIntent(intent1)
+                        ).addCell(new CellBuilder()
+                                .addImage(image2, ListBuilder.LARGE_IMAGE)
+                                .addTitleText("Fast and Casual")
+                                .addText("0.5 mil")
+                                .setContentIntent(intent2)
+                        )
+                        .addCell(new CellBuilder()
+                                .addImage(image3, ListBuilder.LARGE_IMAGE)
+                                .addTitleText("Casual Diner")
+                                .addText("0.9 mi")
+                                .setContentIntent(intent3))
+                        .addCell(new CellBuilder()
+                                .addImage(image4, ListBuilder.LARGE_IMAGE)
+                                .addTitleText("Ramen Spot")
+                                .addText("1.2 mi")
+                                .setContentIntent(intent4))
+                        // Every slice needs a primary action.
+                        .setPrimaryAction(createActivityAction())
+                );
         return listBuilder.build();
     }
     // [END create_slice_with_gridrow]
 
     // [START create_slice_with_range]
     public Slice createSliceWithRange(Uri sliceUri) {
+        if (getContext() == null) {
+            return null;
+        }
         // Construct the parent.
-        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY);
-
-        // Create the input row.
-        ListBuilder.InputRangeBuilder volumeSliderRow = new ListBuilder.InputRangeBuilder(
-                listBuilder)
-                .setTitle("Ring Volume")
-                .setInputAction(volumeChangedPendingIntent)
-                .setMax(100)
-                .setValue(30);
-
-        // Add the row to the list.
-        listBuilder.addInputRange(volumeSliderRow);
-
+        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY)
+                .addRow(new RowBuilder() // Every slice needs a row.
+                        .setTitle("Enter app")
+                         // Every slice needs a primary action.
+                        .setPrimaryAction(createActivityAction())
+                )
+                .addInputRange(new InputRangeBuilder() // Create the input row.
+                        .setTitle("Ring Volume")
+                        .setInputAction(volumeChangedPendingIntent)
+                        .setMax(100)
+                        .setValue(30)
+                );
         return listBuilder.build();
     }
     // [END create_slice_with_range]
 
     // [START create_slice_showing_loading]
     public Slice createSliceShowingLoading(Uri sliceUri) {
+        if (getContext() == null) {
+            return null;
+        }
         // Construct the parent.
-        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY);
-
-        // Construct the row.
-        RowBuilder rowBuilder1 = new RowBuilder(listBuilder)
-                .setTitle("Ride to work");
-
-        // We’re waiting to load the time to work so indicate that on the slice by
-        // setting the subtitle with the overloaded method and indicate true.
-        rowBuilder1.setSubtitle(null, true);
-        rowBuilder1.addEndItem(IconCompat.createWithResource(getContext(), R.drawable.ic_work),
-                ListBuilder.ICON_IMAGE);
-
-        // Add the rows to the list
-        listBuilder.addRow(rowBuilder1);
-
+        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY)
+                // Construct the row.
+                .addRow(new RowBuilder()
+                        .setPrimaryAction(createActivityAction())
+                        .setTitle("Ride to work")
+                        // We’re waiting to load the time to work so indicate that on the slice by
+                        // setting the subtitle with the overloaded method and indicate true.
+                        .setSubtitle(null, true)
+                        .addEndItem(IconCompat.createWithResource(getContext(), R.drawable.ic_work),
+                                ListBuilder.ICON_IMAGE)
+                );
         return listBuilder.build();
     }
+
+    private SliceAction createActivityAction() {
+        return SliceAction.create(
+                PendingIntent.getActivity(
+                        getContext(),
+                        0,
+                        new Intent(getContext(), MainActivity.class),
+                        0
+                ),
+                IconCompat.createWithResource(getContext(), R.drawable.ic_home),
+                ListBuilder.ICON_IMAGE,
+                "Enter app"
+        );
+    }
     // [END create_slice_showing_loading]
 
     // [START see_more_action]
     public Slice seeMoreActionSlice(Uri sliceUri) {
+        if (getContext() == null) {
+            return null;
+        }
         ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY);
         // [START_EXCLUDE]
+        listBuilder.addRow(new RowBuilder()
+                .setTitle("Hello")
+                .setPrimaryAction(createActivityAction())
+        );
         // [END_EXCLUDE]
         listBuilder.setSeeMoreAction(seeAllNetworksPendingIntent);
         // [START_EXCLUDE]
@@ -263,17 +284,27 @@ public Slice seeMoreActionSlice(Uri sliceUri) {
 
     // [START see_more_row]
     public Slice seeMoreRowSlice(Uri sliceUri) {
-        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY);
-        // [START_EXCLUDE]
-        // [END_EXCLUDE]
-        RowBuilder rowBuilder = new RowBuilder(listBuilder)
-                .setTitle("See all available networks")
-                .addEndItem(IconCompat.createWithResource(getContext(), R.drawable.ic_right_caret),
-                        ListBuilder.ICON_IMAGE)
-                .setPrimaryAction(new SliceAction(seeAllNetworksPendingIntent,
-                        IconCompat.createWithResource(getContext(), R.drawable.ic_wifi),
-                        "Wi-Fi Networks"));
-        listBuilder.setSeeMoreRow(rowBuilder);
+        if (getContext() == null) {
+            return null;
+        }
+        ListBuilder listBuilder = new ListBuilder(getContext(), sliceUri, ListBuilder.INFINITY)
+                // [START_EXCLUDE]
+                .addRow(new RowBuilder()
+                        .setTitle("Hello")
+                        .setPrimaryAction(createActivityAction())
+                )
+                // [END_EXCLUDE]
+                .setSeeMoreRow(new RowBuilder()
+                        .setTitle("See all available networks")
+                        .addEndItem(IconCompat
+                                        .createWithResource(getContext(), R.drawable
+                                                .ic_right_caret),
+                                ListBuilder.ICON_IMAGE)
+                        .setPrimaryAction(SliceAction.create(seeAllNetworksPendingIntent,
+                                IconCompat.createWithResource(getContext(), R.drawable.ic_wifi),
+                                ListBuilder.ICON_IMAGE,
+                                "Wi-Fi Networks"))
+                );
         // [START_EXCLUDE]
         // [END_EXCLUDE]
         return listBuilder.build();
diff --git a/slice/src/main/java/com/example/android/slice/kotlin/GettingStartedSliceProvider.kt b/slice/src/main/java/com/example/android/slice/kotlin/GettingStartedSliceProvider.kt
index f4f690de0..c1db612ba 100644
--- a/slice/src/main/java/com/example/android/slice/kotlin/GettingStartedSliceProvider.kt
+++ b/slice/src/main/java/com/example/android/slice/kotlin/GettingStartedSliceProvider.kt
@@ -33,13 +33,20 @@ class GettingStartedSliceProvider : SliceProvider() {
 
     // [START on_bind_slice]
     override fun onBindSlice(sliceUri: Uri): Slice? {
+        val activityAction = createActivityAction()
         return if (sliceUri.path == "/hello") {
             list(context, sliceUri, ListBuilder.INFINITY) {
-                row { setTitle("URI found.") }
+                row {
+                    primaryAction = activityAction
+                    title = "Hello World."
+                }
             }
         } else {
             list(context, sliceUri, ListBuilder.INFINITY) {
-                row { setTitle("URI not found.") }
+                row {
+                    primaryAction = activityAction
+                    title = "URI not recognized."
+                }
             }
         }
     }
@@ -54,18 +61,19 @@ class GettingStartedSliceProvider : SliceProvider() {
         val activityAction = createActivityAction()
         return list(context, sliceUri, INFINITY) {
             row {
-                setTitle("Perform action in app")
-                setPrimaryAction(activityAction)
+                title = "Perform action in app"
+                primaryAction = activityAction
             }
         }
     }
 
     fun createActivityAction(): SliceAction {
         val intent = Intent(context, MainActivity::class.java)
-        return SliceAction(
-            PendingIntent.getActivity(context, 0, intent, 0),
+        return SliceAction.create(
+            PendingIntent.getActivity(context, 0, Intent(context, MainActivity::class.java), 0),
             IconCompat.createWithResource(context, R.drawable.ic_home),
-            "Open MainActivity."
+            ListBuilder.ICON_IMAGE,
+            "Enter app"
         )
     }
     // [END create_slice]
@@ -73,17 +81,21 @@ class GettingStartedSliceProvider : SliceProvider() {
     // [START create_brightness_slice]
     fun createBrightnessSlice(sliceUri: Uri): Slice {
         val toggleAction =
-            SliceAction(createToggleIntent(), "Toggle adaptive brightness", true)
+            SliceAction.createToggle(
+                createToggleIntent(),
+                "Toggle adaptive brightness",
+                true
+            )
         return list(context, sliceUri, ListBuilder.INFINITY) {
             row {
-                setTitle("Adaptive brightness")
-                setSubtitle("Optimizes brightness for available light")
-                setPrimaryAction(toggleAction)
+                title = "Adaptive brightness"
+                subtitle = "Optimizes brightness for available light"
+                primaryAction = toggleAction
             }
             inputRange {
-                setInputAction(brightnessPendingIntent)
-                setMax(100)
-                setValue(45)
+                inputAction = (brightnessPendingIntent)
+                max = 100
+                value = 45
             }
         }
     }
@@ -100,22 +112,27 @@ class GettingStartedSliceProvider : SliceProvider() {
     fun createDynamicSlice(sliceUri: Uri): Slice {
         return when (sliceUri.path) {
             "/count" -> {
-                val toastAndIncrementAction = SliceAction(
-                    createToastAndIncrementIntent("Item clicked"),
-                    actionIcon, "Increment."
+                val toastAndIncrementAction = SliceAction.create(
+                    createToastAndIncrementIntent("Item clicked."),
+                    actionIcon,
+                    ListBuilder.ICON_IMAGE,
+                    "Increment."
                 )
                 list(context, sliceUri, ListBuilder.INFINITY) {
                     row {
-                        setPrimaryAction(toastAndIncrementAction)
-                        setTitle("Count: ${MyBroadcastReceiver.receivedCount}")
-                        setSubtitle("Click me")
+                        primaryAction = toastAndIncrementAction
+                        title = "Count: ${MyBroadcastReceiver.receivedCount}"
+                        subtitle = "Click me"
                     }
                 }
             }
 
             else -> {
                 list(context, sliceUri, ListBuilder.INFINITY) {
-                    row { setTitle("URI not found.") }
+                    row {
+                        primaryAction = createActivityAction()
+                        title = "URI not found."
+                    }
                 }
             }
         }
diff --git a/slice/src/main/java/com/example/android/slice/kotlin/MySliceProvider.kt b/slice/src/main/java/com/example/android/slice/kotlin/MySliceProvider.kt
index 6590b08e5..8dd5d3fa7 100644
--- a/slice/src/main/java/com/example/android/slice/kotlin/MySliceProvider.kt
+++ b/slice/src/main/java/com/example/android/slice/kotlin/MySliceProvider.kt
@@ -67,16 +67,16 @@ class MySliceProvider : SliceProvider() {
         list(context, sliceUri, ListBuilder.INFINITY) {
             setAccentColor(0xff0F9D) // Specify color for tinting icons
             header {
-                setTitle("Get a ride")
-                setSubtitle("Ride in 4 min")
-                setSummary("Work in 1 hour 45 min | Home in 12 min")
+                title = "Get a ride"
+                subtitle = "Ride in 4 min"
+                summary = "Work in 1 hour 45 min | Home in 12 min"
             }
             row {
-                setTitle("Home")
-                setSubtitle("12 miles | 12 min | $9.00")
+                title = "Home"
+                subtitle = "12 miles | 12 min | $9.00"
                 addEndItem(
                     IconCompat.createWithResource(context, R.drawable.ic_home),
-                    SliceHints.ICON_IMAGE
+                    ListBuilder.ICON_IMAGE
                 )
             }
         }
@@ -85,21 +85,21 @@ class MySliceProvider : SliceProvider() {
     // [START create_slice_with_action_in_header]
     fun createSliceWithActionInHeader(sliceUri: Uri): Slice {
         // Construct our slice actions.
-        val noteAction = SliceAction(
+        val noteAction = SliceAction.create(
             takeNoteIntent,
             IconCompat.createWithResource(context, R.drawable.ic_pencil),
             ICON_IMAGE,
             "Take note"
         )
 
-        val voiceNoteAction = SliceAction(
+        val voiceNoteAction = SliceAction.create(
             voiceNoteIntent,
             IconCompat.createWithResource(context, R.drawable.ic_mic),
             ICON_IMAGE,
             "Take voice note"
         )
 
-        val cameraNoteAction = SliceAction(
+        val cameraNoteAction = SliceAction.create(
             cameraNoteIntent,
             IconCompat.createWithResource(context, R.drawable.ic_camera),
             ICON_IMAGE,
@@ -110,8 +110,8 @@ class MySliceProvider : SliceProvider() {
         return list(context, sliceUri, ListBuilder.INFINITY) {
             setAccentColor(0xfff4b4) // Specify color for tinting icons
             header {
-                setTitle("Create new note")
-                setSubtitle("Easily done with this note taking app")
+                title = "Create new note"
+                subtitle = "Easily done with this note taking app"
             }
             addAction(noteAction)
             addAction(voiceNoteAction)
@@ -123,24 +123,26 @@ class MySliceProvider : SliceProvider() {
     // [START create_action_with_action_in_row]
     fun createActionWithActionInRow(sliceUri: Uri): Slice {
         // Primary action - open wifi settings.
-        val primaryAction = SliceAction(
+        val wifiAction = SliceAction.create(
             wifiSettingsPendingIntent,
             IconCompat.createWithResource(context, R.drawable.ic_wifi),
+            ICON_IMAGE,
             "Wi-Fi Settings"
         )
 
         // Toggle action - toggle wifi.
-        val toggleAction = SliceAction(
+        val toggleAction = SliceAction.createToggle(
             wifiTogglePendingIntent,
-            "Toggle Wi-Fi", isConnected /* isChecked */
+            "Toggle Wi-Fi",
+            isConnected /* isChecked */
         )
 
         // Create the parent builder.
         return list(context, wifiUri, ListBuilder.INFINITY) {
             setAccentColor(0xff4285) // Specify color for tinting icons / controls.
             row {
-                setTitle("Wi-Fi")
-                setPrimaryAction(primaryAction)
+                title = "Wi-Fi"
+                primaryAction = wifiAction
                 addEndItem(toggleAction)
             }
         }
@@ -152,33 +154,35 @@ class MySliceProvider : SliceProvider() {
         // Create the parent builder.
         return list(context, sliceUri, ListBuilder.INFINITY) {
             header {
-                setTitle("Famous restaurants")
-                setPrimaryAction(SliceAction(pendingIntent, icon, "Famous restaurants"))
+                title = "Famous restaurants"
+                primaryAction = SliceAction.create(
+                    pendingIntent, icon, ListBuilder.ICON_IMAGE, "Famous restaurants"
+                )
             }
             gridRow {
                 cell {
                     addImage(image1, LARGE_IMAGE)
                     addTitleText("Top Restaurant")
                     addText("0.3 mil")
-                    setContentIntent(intent1)
+                    contentIntent = intent1
                 }
                 cell {
                     addImage(image2, LARGE_IMAGE)
                     addTitleText("Fast and Casual")
                     addText("0.5 mil")
-                    setContentIntent(intent2)
+                    contentIntent = intent2
                 }
                 cell {
                     addImage(image3, LARGE_IMAGE)
                     addTitleText("Casual Diner")
                     addText("0.9 mi")
-                    setContentIntent(intent3)
+                    contentIntent = intent3
                 }
                 cell {
                     addImage(image4, LARGE_IMAGE)
                     addTitleText("Ramen Spot")
                     addText("1.2 mi")
-                    setContentIntent(intent4)
+                    contentIntent = intent4
                 }
             }
         }
@@ -189,10 +193,10 @@ class MySliceProvider : SliceProvider() {
     fun createSliceWithRange(sliceUri: Uri): Slice {
         return list(context, sliceUri, ListBuilder.INFINITY) {
             inputRange {
-                setTitle("Ring Volume")
-                setInputAction(volumeChangedPendingIntent)
-                setMax(100)
-                setValue(30)
+                title = "Ring Volume"
+                inputAction = volumeChangedPendingIntent
+                max = 100
+                value = 30
             }
         }
     }
@@ -204,11 +208,9 @@ class MySliceProvider : SliceProvider() {
         // setting the subtitle with the overloaded method and indicate true.
         return list(context, sliceUri, ListBuilder.INFINITY) {
             row {
-                setTitle("Ride to work")
+                title = "Ride to work"
                 setSubtitle(null, true)
-                addEndItem(
-                    IconCompat.createWithResource(context, R.drawable.ic_work), ICON_IMAGE
-                )
+                addEndItem(IconCompat.createWithResource(context, R.drawable.ic_work), ICON_IMAGE)
             }
         }
     }
@@ -231,16 +233,15 @@ class MySliceProvider : SliceProvider() {
             // [START_EXCLUDE]
             // [END_EXCLUDE]
             seeMoreRow {
-                setTitle("See all available networks")
+                title = "See all available networks"
                 addEndItem(
                     IconCompat.createWithResource(context, R.drawable.ic_right_caret), ICON_IMAGE
                 )
-                setPrimaryAction(
-                    SliceAction(
-                        seeAllNetworksPendingIntent,
-                        IconCompat.createWithResource(context, R.drawable.ic_wifi),
-                        "Wi-Fi Networks"
-                    )
+                primaryAction = SliceAction.create(
+                    seeAllNetworksPendingIntent,
+                    IconCompat.createWithResource(context, R.drawable.ic_wifi),
+                    ListBuilder.ICON_IMAGE,
+                    "Wi-Fi Networks"
                 )
             }
         }