Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c7fe6f8 authored by Matthew Fritze's avatar Matthew Fritze Committed by android-build-merger
Browse files

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

am: 4199198e

Change-Id: I3716adf421c539c4a4f0617a5ab8d1a1f89e7cbc
parents 6197f671 4199198e

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

+2 −3
Original line number Diff line number Diff line
@@ -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))

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

+4 −0
Original line number Diff line number Diff line
@@ -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(