commit 4199198ec2bf5fb061fd033656dad3e9d95a49d2
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 31 16:03:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 31 16:03:25 2018 +0000
tree 6a5fe8563fa299f3c550037d3d672873de3d092a
parent acfbc0eff45a8724817a90d81bd7173aeff732ff
parent 93307cdb69bb3dd249fb9f130482c39a8636e9e5

Merge "Make Settings Slider Slices one row" into pi-dev

src/com/android/settings/slices/SliceBuilderUtils.java

diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index be433b7..d2c2669 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -287,11 +287,10 @@
 
         return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
                 .setAccentColor(color)
-                .setHeader(builder -> builder
+                .addInputRange(builder -> builder
                         .setTitle(sliceData.getTitle())
                         .setSubtitle(subtitleText)
-                        .setPrimaryAction(primaryAction))
-                .addInputRange(builder -> builder
+                        .setPrimaryAction(primaryAction)
                         .setMax(sliderController.getMaxSteps())
                         .setValue(sliderController.getSliderPosition())
                         .setInputAction(actionIntent))

tests/robotests/src/com/android/settings/testutils/SliceTester.java

diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
index 7dd22aa..d505529 100644
--- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java
+++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
@@ -43,6 +43,7 @@
 import androidx.slice.builders.ListBuilder;
 import androidx.slice.core.SliceAction;
 import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.EventInfo;
 
 import android.support.v4.graphics.drawable.IconCompat;
 
@@ -159,6 +160,9 @@
         final long sliceTTL = metadata.getExpiry();
         assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY);
 
+        final int headerType = metadata.getHeaderType();
+        assertThat(headerType).isEqualTo(EventInfo.ROW_TYPE_SLIDER);
+
         // Check primary intent
         final PendingIntent primaryPendingIntent = primaryAction.getAction();
         assertThat(primaryPendingIntent).isEqualTo(