PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-31 16:03:25 +00:00
committed by Android (Google) Code Review
parent acfbc0eff4 93307cdb69
commit 4199198ec2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -287,11 +287,10 @@ public class SliceBuilderUtils {
return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY) return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
.setAccentColor(color) .setAccentColor(color)
.setHeader(builder -> builder .addInputRange(builder -> builder
.setTitle(sliceData.getTitle()) .setTitle(sliceData.getTitle())
.setSubtitle(subtitleText) .setSubtitle(subtitleText)
.setPrimaryAction(primaryAction)) .setPrimaryAction(primaryAction)
.addInputRange(builder -> builder
.setMax(sliderController.getMaxSteps()) .setMax(sliderController.getMaxSteps())
.setValue(sliderController.getSliderPosition()) .setValue(sliderController.getSliderPosition())
.setInputAction(actionIntent)) .setInputAction(actionIntent))

4
tests/robotests/src/com/android/settings/testutils/SliceTester.java
View File

@@ -43,6 +43,7 @@ import androidx.slice.SliceMetadata;
import androidx.slice.builders.ListBuilder; import androidx.slice.builders.ListBuilder;
import androidx.slice.core.SliceAction; import androidx.slice.core.SliceAction;
import androidx.slice.core.SliceQuery; import androidx.slice.core.SliceQuery;
import androidx.slice.widget.EventInfo;
import android.support.v4.graphics.drawable.IconCompat; import android.support.v4.graphics.drawable.IconCompat;
@@ -159,6 +160,9 @@ public class SliceTester {
final long sliceTTL = metadata.getExpiry(); final long sliceTTL = metadata.getExpiry();
assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY); assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY);
final int headerType = metadata.getHeaderType();
assertThat(headerType).isEqualTo(EventInfo.ROW_TYPE_SLIDER);
// Check primary intent // Check primary intent
final PendingIntent primaryPendingIntent = primaryAction.getAction(); final PendingIntent primaryPendingIntent = primaryAction.getAction();
assertThat(primaryPendingIntent).isEqualTo( assertThat(primaryPendingIntent).isEqualTo(