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

Merge "Fix regression of wrong min value on night display slice" into qt-dev

Browse Source 
am: 93aee0d99d

Change-Id: I153d69e5cc07ab5a2aec7972150a80f706ccdb87
This commit is contained in:
lindatseng
2019-04-18 13:24:12 -07:00
committed by android-build-merger
parent b857e83e75 93aee0d99d
commit 35b17ed655
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
View File

@@ -82,7 +82,8 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC
@Override
public int getMin() {
return ColorDisplayManager.getMinimumColorTemperature(mContext);
// The min should always be 0 in this case.
return 0;
}
/**

20
tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java
View File

@@ -84,11 +84,25 @@ public class NightDisplayIntensityPreferenceControllerTest {
.isEqualTo(3030);
}
@Test
public void rangeOfSlider_staysWithinValidRange() {
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_nightDisplayColorTemperatureMin, 2950);
SettingsShadowResources.overrideResource(
com.android.internal.R.integer.config_nightDisplayColorTemperatureMax, 3050);
assertThat(mPreferenceController.getMax() - mPreferenceController.getMin())
.isGreaterThan(0);
}
@Test
public void getMin_alwaysReturnsZero() {
assertThat(mPreferenceController.getMin()).isEqualTo(0);
}
@Test
public void isSliceableCorrectKey_returnsTrue() {
final NightDisplayIntensityPreferenceController controller =
new NightDisplayIntensityPreferenceController(mContext, "night_display_temperature");
assertThat(controller.isSliceable()).isTrue();
assertThat(mPreferenceController.isSliceable()).isTrue();
}
@Test