Merge "Add labels to intensity slider and flip labels" into sc-dev am: afd77763b9 am: a1c3689199

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14970080

Change-Id: Id25a4844c64f348127c7c92bcef3e8a82477c8bb
This commit is contained in:
Sally Yuen
2021-06-17 16:06:13 +00:00
committed by Automerger Merge Worker
4 changed files with 24 additions and 9 deletions

View File

@@ -84,7 +84,7 @@ public class ReduceBrightColorsIntensityPreferenceControllerTest {
assertThat(
Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL, 0))
.isEqualTo(20);
.isEqualTo(80);
}
@Test
@@ -92,8 +92,10 @@ public class ReduceBrightColorsIntensityPreferenceControllerTest {
when(mResources.getInteger(
R.integer.config_reduceBrightColorsStrengthMax)).thenReturn(90);
when(mResources.getInteger(
R.integer.config_reduceBrightColorsStrengthMin)).thenReturn(10);
R.integer.config_reduceBrightColorsStrengthMin)).thenReturn(15);
assertThat(mPreferenceController.getMax()).isEqualTo(85);
assertThat(mPreferenceController.getMin()).isEqualTo(10);
assertThat(mPreferenceController.getMax() - mPreferenceController.getMin())
.isEqualTo(80);
.isEqualTo(75);
}
}