We did not set the min value on slider slices when converting them
from preference to slices, which makes the slices all have min 0.
However, there are some slider which should have min value greater
than 0, for example, call and alarm.
We should get the min value and apply it to slider slice to make it
consistent with what we have in settings pref.
Test: Manual verification
Test: make -j40 RunSettingRobotests
Test: atest VolumeSeekBarPreferenceControllerTest
Fixes:
130439216
Fixes:
130358208
Change-Id: Ib4399c36c7da3ac41a6d46a6c150f0ec1b9b0b0f
}
/**
- * @return the value of the Slider's position based on the range: [0, maxSteps).
+ * @return the value of the Slider's position based on the range: [min, max].
*/
public abstract int getSliderPosition();
public abstract boolean setSliderPosition(int position);
/**
- * @return the number of steps supported by the slider.
+ * @return the maximum value supported by the slider.
*/
- public abstract int getMaxSteps();
+ public abstract int getMax();
+
+ /**
+ * @return the minimum value supported by the slider.
+ */
+ public abstract int getMin();
@Override
public int getSliceType() {
super.displayPreference(screen);
final SeekBarPreference preference = screen.findPreference(getPreferenceKey());
preference.setContinuousUpdates(true);
- preference.setMax(getMaxSteps());
+ preference.setMax(getMax());
+ preference.setMin(getMin());
}
@Override
}
@Override
- public int getMaxSteps() {
+ public int getMax() {
return convertTemperature(ColorDisplayManager.getMinimumColorTemperature(mContext));
}
+ @Override
+ public int getMin() {
+ return ColorDisplayManager.getMinimumColorTemperature(mContext);
+ }
+
/**
* Inverts and range-adjusts a raw value from the SeekBar (i.e. [0, maxTemp-minTemp]), or
* converts an inverted and range-adjusted value to the raw SeekBar value, depending on the
public int getMaxVolume(int stream) {
return mAudioManager.getStreamMaxVolume(stream);
}
+
+ public int getMinVolume(int stream) {
+ return mAudioManager.getStreamMinVolume(stream);
+ }
}
}
@Override
- public int getMaxSteps() {
+ public int getMax() {
if (mPreference != null) {
return mPreference.getMax();
}
}
@Override
+ public int getMin() {
+ if (mPreference != null) {
+ return mPreference.getMin();
+ }
+ return 0;
+ }
+
+ @Override
public boolean isSliceable() {
return TextUtils.equals(getPreferenceKey(), KEY_REMOTE_VOLUME);
}
}
@Override
- public int getMaxSteps() {
+ public int getMax() {
if (mPreference != null) {
return mPreference.getMax();
}
return mHelper.getMaxVolume(getAudioStream());
}
+ @Override
+ public int getMin() {
+ if (mPreference != null) {
+ return mPreference.getMin();
+ }
+ return mHelper.getMinVolume(getAudioStream());
+ }
+
protected abstract int getAudioStream();
protected abstract int getMuteIcon();
}
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);
.setTitle(sliceData.getTitle())
.setSubtitle(subtitleText)
.setPrimaryAction(primaryAction)
- .setMax(sliderController.getMaxSteps())
+ .setMax(sliderController.getMax())
+ .setMin(sliderController.getMin())
.setValue(sliderController.getSliderPosition())
.setInputAction(actionIntent))
.setKeywords(keywords)
"key");
mPreference.setContinuousUpdates(true);
- mPreference.setMax(mSliderController.getMaxSteps());
+ mPreference.setMin(mSliderController.getMin());
+ mPreference.setMax(mSliderController.getMax());
}
@Test
}
@Override
- public int getMaxSteps() {
+ public int getMax() {
return MAX_STEPS;
}
@Override
+ public int getMin() {
+ return 0;
+ }
+
+ @Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
}
@Override
- public int getMaxSteps() {
+ public int getMax() {
return MAX_STEPS;
}
@Override
+ public int getMin() {
+ return 0;
+ }
+
+ @Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
}
@Override
- public int getMaxSteps() {
+ public int getMax() {
+ return 0;
+ }
+
+ @Override
+ public int getMin() {
return 0;
}
}
}
@Test
- public void getMaxSteps_controllerNull_returnZero() {
+ public void getMinValue_controllerNull_returnZero() {
mController.mMediaController = null;
- assertThat(mController.getMaxSteps()).isEqualTo(0);
+ assertThat(mController.getMin()).isEqualTo(0);
}
@Test
- public void getMaxSteps_controllerExists_returnValue() {
+ public void getMinValue_controllerExists_returnValue() {
mController.mMediaController = mMediaController;
- assertThat(mController.getMaxSteps()).isEqualTo(MAX_POS);
+ assertThat(mController.getMin()).isEqualTo(0);
+ }
+
+ @Test
+ public void getMaxValue_controllerNull_returnZero() {
+ mController.mMediaController = null;
+
+ assertThat(mController.getMax()).isEqualTo(0);
+ }
+
+ @Test
+ public void getMaxValue_controllerExists_returnValue() {
+ mController.mMediaController = mMediaController;
+
+ assertThat(mController.getMax()).isEqualTo(MAX_POS);
}
@Test
public void sliderMethods_handleNullPreference() {
when(mHelper.getStreamVolume(mController.getAudioStream())).thenReturn(4);
when(mHelper.getMaxVolume(mController.getAudioStream())).thenReturn(10);
+ when(mHelper.getMinVolume(mController.getAudioStream())).thenReturn(1);
- assertThat(mController.getMaxSteps()).isEqualTo(10);
+ assertThat(mController.getMax()).isEqualTo(10);
+ assertThat(mController.getMin()).isEqualTo(1);
assertThat(mController.getSliderPosition()).isEqualTo(4);
mController.setSliderPosition(9);
}
@Test
- public void getMaxSteps_passesAlongValue() {
+ public void getMaxValue_passesAlongValue() {
when(mPreference.getMax()).thenReturn(6);
mController.displayPreference(mScreen);
- assertThat(mController.getMaxSteps()).isEqualTo(6);
+ assertThat(mController.getMax()).isEqualTo(6);
+ }
+
+ @Test
+ public void getMinValue_passesAlongValue() {
+ when(mPreference.getMin()).thenReturn(1);
+ mController.displayPreference(mScreen);
+
+ assertThat(mController.getMin()).isEqualTo(1);
}
@Test
.build();
final ContentResolver resolver = mock(ContentResolver.class);
doReturn(resolver).when(mContext).getContentResolver();
- final int position = FakeSliderController.MAX_STEPS - 1;
- final int oldPosition = FakeSliderController.MAX_STEPS;
+ final int position = FakeSliderController.MAX_VALUE - 1;
+ final int oldPosition = FakeSliderController.MAX_VALUE;
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
insertSpecialCase(FakeSliderController.class, key);
// Insert Fake Slider into Database
final String key = "key";
- final int position = FakeSliderController.MAX_STEPS - 1;
- final int oldPosition = FakeSliderController.MAX_STEPS;
+ final int position = FakeSliderController.MAX_VALUE - 1;
+ final int oldPosition = FakeSliderController.MAX_VALUE;
mSearchFeatureProvider.getSearchIndexableResources().getProviderValues().clear();
insertSpecialCase(FakeSliderController.class, key);
public static final String AVAILABILITY_KEY = "fake_slider_availability_key";
- public static final int MAX_STEPS = 9;
+ public static final int MAX_VALUE = 9;
private static final String SETTING_KEY = "fake_slider_key";
}
@Override
- public int getMaxSteps() {
- return MAX_STEPS;
+ public int getMax() {
+ return MAX_VALUE;
+ }
+
+ @Override
+ public int getMin() {
+ return 0;
}
@Override
OSDN Git Service
