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

Commit 93bbca22 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Inline slider with header"

parents 41cbe4b7 647be5fc

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

+6 −3
Original line number Diff line number Diff line
@@ -280,18 +280,21 @@ public class SliceBuilderUtils { 
        final PendingIntent contentIntent = getContentPendingIntent(context, sliceData);

        final IconCompat icon = IconCompat.createWithResource(context, sliceData.getIconResource());

        @ColorInt final int color = Utils.getColorAccentDefaultColor(context);

        final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);

        final SliceAction primaryAction = new SliceAction(contentIntent, icon,

                sliceData.getTitle());

        final List<String> keywords = buildSliceKeywords(sliceData);



        return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)

                .setAccentColor(color)

                .addInputRange(builder -> builder

                .setHeader(builder -> builder

                        .setTitle(sliceData.getTitle())

                        .setSubtitle(subtitleText)

                        .setPrimaryAction(primaryAction))

                .addInputRange(builder -> builder

                        .setMax(sliderController.getMaxSteps())

                        .setValue(sliderController.getSliderPosition())

                        .setInputAction(actionIntent)

                        .setPrimaryAction(primaryAction))

                        .setInputAction(actionIntent))

                .setKeywords(keywords)

                .build();

    }

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

+5 −2
Original line number Diff line number Diff line
@@ -150,14 +150,17 @@ public class SliceTester { 
        final int color = colorItem.getInt();

        assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));



        final IconCompat expectedToggleIcon = IconCompat.createWithResource(context,

        final SliceAction primaryAction = metadata.getPrimaryAction();



        final IconCompat expectedIcon = IconCompat.createWithResource(context,

                sliceData.getIconResource());

        assertThat(expectedIcon.toString()).isEqualTo(primaryAction.getIcon().toString());



        final long sliceTTL = metadata.getExpiry();

        assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY);



        // Check primary intent

        final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();

        final PendingIntent primaryPendingIntent = primaryAction.getAction();

        assertThat(primaryPendingIntent).isEqualTo(

                SliceBuilderUtils.getContentPendingIntent(context, sliceData));