From 93307cdb69bb3dd249fb9f130482c39a8636e9e5 Mon Sep 17 00:00:00 2001
From: Matthew Fritze <mfritze@google.com>
Date: Wed, 30 May 2018 15:39:43 -0700
Subject: [PATCH] Make Settings Slider Slices one row

To unify all Settings slices into one row, we change
Settings Slider from user a header and a input range to
only using an Input Range.

Change-Id: I61715a45b29b6a52a47711811e5c6b2c83d50901
Fixes: 80430118
Test: robotests
---
 src/com/android/settings/slices/SliceBuilderUtils.java       | 5 ++---
 .../src/com/android/settings/testutils/SliceTester.java      | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index be433b7e658..d2c266982fb 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -287,11 +287,10 @@ public class SliceBuilderUtils {
 
         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))
diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
index 7dd22aa092a..d5055293361 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.SliceMetadata;
 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 @@ public class SliceTester {
         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(