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

Merge "Change on/off values for Force Bold Text"

Browse Source
This commit is contained in:
Sally Yuen
2020-11-16 16:55:48 +00:00
committed by Android (Google) Code Review
parent d7d869bcdd 12f2d67fea
commit 67a9908db4
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/accessibility_settings.xml
View File

@@ -90,7 +90,7 @@
android:key="toggle_force_bold_text"
android:persistent="false"
android:title="@string/force_bold_text"
settings:controller="com.android.settings.accessibility.ForceBoldTextPreferenceController"/>
settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory

14
src/com/android/settings/accessibility/ForceBoldTextPreferenceController.java → src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
View File

@@ -17,15 +17,17 @@
package com.android.settings.accessibility;
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.fonts.FontStyle;
import android.provider.Settings;
import com.android.settings.core.TogglePreferenceController;
/** PreferenceController for displaying all text in bold. */
public class ForceBoldTextPreferenceController extends TogglePreferenceController {
public class FontWeightAdjustmentPreferenceController extends TogglePreferenceController {
static final int BOLD_TEXT_ADJUSTMENT =
FontStyle.FONT_WEIGHT_BOLD - FontStyle.FONT_WEIGHT_NORMAL;
public ForceBoldTextPreferenceController(Context context, String preferenceKey) {
public FontWeightAdjustmentPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@@ -37,14 +39,12 @@ public class ForceBoldTextPreferenceController extends TogglePreferenceControlle
@Override
public boolean isChecked() {
return Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.FORCE_BOLD_TEXT, Configuration.FORCE_BOLD_TEXT_NO)
== Configuration.FORCE_BOLD_TEXT_YES;
Settings.Secure.FONT_WEIGHT_ADJUSTMENT, 0) == BOLD_TEXT_ADJUSTMENT;
}
@Override
public boolean setChecked(boolean isChecked) {
return Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.FORCE_BOLD_TEXT,
(isChecked ? Configuration.FORCE_BOLD_TEXT_YES : Configuration.FORCE_BOLD_TEXT_NO));
Settings.Secure.FONT_WEIGHT_ADJUSTMENT, (isChecked ? BOLD_TEXT_ADJUSTMENT : 0));
}
}

29
tests/robotests/src/com/android/settings/accessibility/ForceBoldTextPreferenceControllerTest.java → tests/robotests/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceControllerTest.java
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);
}
}