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

Merge "Enforce min value on panel slices slider" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-16 21:18:05 +00:00
committed by Android (Google) Code Review
parent ad06c36882 fadedb321c
commit cef4e42dc2
14 changed files with 108 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/slices/SliceBroadcastReceiver.java
View File

@@ -164,11 +164,12 @@ public class SliceBroadcastReceiver extends BroadcastReceiver {
}
final SliderPreferenceController sliderController = (SliderPreferenceController) controller;
final int maxSteps = sliderController.getMaxSteps();
if (newPosition < 0 || newPosition > maxSteps) {
final int minValue = sliderController.getMin();
final int maxValue = sliderController.getMax();
if (newPosition < minValue || newPosition > maxValue) {
throw new IllegalArgumentException(
"Invalid position passed to Slider controller. Expected between 0 and "
+ maxSteps + " but found " + newPosition);
"Invalid position passed to Slider controller. Expected between " + minValue
+ " and " + maxValue + " but found " + newPosition);
}
sliderController.setSliderPosition(newPosition);

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

@@ -326,7 +326,8 @@ public class SliceBuilderUtils {
.setTitle(sliceData.getTitle())
.setSubtitle(subtitleText)
.setPrimaryAction(primaryAction)
.setMax(sliderController.getMaxSteps())
.setMax(sliderController.getMax())
.setMin(sliderController.getMin())
.setValue(sliderController.getSliderPosition())
.setInputAction(actionIntent))
.setKeywords(keywords)