Change on/off values for Force Bold Text

Use On = 300 and Off = 0. Rename setting.

Bug: b/170966021, b/110991537
Test: builds and toggle works, atest
FontWeightAdjustmentPreferenceControllerTest

Change-Id: Icf5d15fc26266578ad78bae5b6f80d193e63c82d
This commit is contained in:
Sally
2020-11-03 18:12:53 +00:00
parent 76eb401911
commit 12f2d67fea
3 changed files with 22 additions and 23 deletions

View File

@@ -32,20 +32,20 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class ForceBoldTextPreferenceControllerTest {
private static final int ON = 2;
private static final int OFF = 1;
private static final int UNKNOWN = 0;
public class FontWeightAdjustmentPreferenceControllerTest {
private static final int ON = FontWeightAdjustmentPreferenceController.BOLD_TEXT_ADJUSTMENT;
private static final int OFF = 0;
private Context mContext;
private SwitchPreference mPreference;
private ForceBoldTextPreferenceController mController;
private FontWeightAdjustmentPreferenceController mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mPreference = new SwitchPreference(mContext);
mController = new ForceBoldTextPreferenceController(mContext, "force_bold_text");
mController = new FontWeightAdjustmentPreferenceController(
mContext, "font_weight_adjustment");
}
@Test
@@ -55,9 +55,9 @@ public class ForceBoldTextPreferenceControllerTest {
}
@Test
public void isChecked_enabledTextContrast_shouldReturnTrue() {
public void isChecked_enabledBoldText_shouldReturnTrue() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.FORCE_BOLD_TEXT, ON);
Settings.Secure.FONT_WEIGHT_ADJUSTMENT, ON);
mController.updateState(mPreference);
@@ -66,9 +66,9 @@ public class ForceBoldTextPreferenceControllerTest {
}
@Test
public void isChecked_disabledTextContrast_shouldReturnFalse() {
public void isChecked_disabledBoldText_shouldReturnFalse() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.FORCE_BOLD_TEXT, OFF);
Settings.Secure.FONT_WEIGHT_ADJUSTMENT, OFF);
mController.updateState(mPreference);
@@ -77,19 +77,18 @@ public class ForceBoldTextPreferenceControllerTest {
}
@Test
public void setChecked_setTrue_shouldEnableTextContrast() {
public void setChecked_setTrue_shouldEnableBoldText() {
mController.setChecked(true);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.FORCE_BOLD_TEXT, UNKNOWN)).isEqualTo(ON);
Settings.Secure.FONT_WEIGHT_ADJUSTMENT, OFF)).isEqualTo(ON);
}
@Test
public void setChecked_setFalse_shouldDisableTextContrast() {
public void setChecked_setFalse_shouldDisableBoldText() {
mController.setChecked(false);
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.FORCE_BOLD_TEXT, UNKNOWN)).isEqualTo(OFF);
Settings.Secure.FONT_WEIGHT_ADJUSTMENT, OFF)).isEqualTo(OFF);
}
}