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

Update inclusive language for Accessibility Settings

Browse Source 
Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I67032d4beb7c8ae6b5a3271ea75ca38be4351484
This commit is contained in:
Edgar Wang
2020-08-06 00:34:35 +08:00
parent f534811627
commit dd032d3734
14 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
View File

@@ -120,7 +120,7 @@ public class LaunchAccessibilityActivityPreferenceFragment extends
protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();
final String switchBarText = (info == null) ? EMPTY_STRING : getString(
R.string.accessibility_service_master_open_title,
R.string.accessibility_service_primary_open_title,
info.getActivityInfo().loadLabel(getPackageManager()));
switchPreference.setTitle(switchBarText);

7
src/com/android/settings/accessibility/MasterMonoPreferenceController.java → src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
View File

@@ -22,9 +22,12 @@ import android.provider.Settings;
import com.android.settings.core.TogglePreferenceController;
public class MasterMonoPreferenceController extends TogglePreferenceController {
/**
* A toggle preference controller for Primary Mono
*/
public class PrimaryMonoPreferenceController extends TogglePreferenceController {
public MasterMonoPreferenceController(Context context, String preferenceKey) {
public PrimaryMonoPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}

2
src/com/android/settings/accessibility/ShortcutPreference.java
View File

@@ -62,7 +62,7 @@ public class ShortcutPreference extends Preference {
ShortcutPreference(Context context, AttributeSet attrs) {
super(context, attrs);
setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
setWidgetLayoutResource(R.layout.preference_widget_master_switch);
setWidgetLayoutResource(R.layout.preference_widget_primary_switch);
setIconSpaceReserved(true);
}

2
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

@@ -180,7 +180,7 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe
@Override
protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
switchPreference.setTitle(R.string.accessibility_daltonizer_master_switch_title);
switchPreference.setTitle(R.string.accessibility_daltonizer_primary_switch_title);
}
@Override