Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use inclusive language

Browse Source 
Test: builds
Bug: na
Change-Id: I014007bccfa2671c2887a3f239ed0e87b80c01ce
This commit is contained in:
Sally
2020-10-13 18:19:11 +00:00
parent e131718f36
commit b5248c1f92
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java
View File

@@ -113,7 +113,7 @@ public final class AccessibilityTargetHelper {
@ShortcutType int shortcutType) {
final List<AccessibilityTarget> targets = new ArrayList<>();
targets.addAll(getAccessibilityFilteredTargets(context, shortcutType));
targets.addAll(getWhiteListingFeatureTargets(context, shortcutType));
targets.addAll(getAllowListingFeatureTargets(context, shortcutType));
return targets;
}
@@ -197,12 +197,12 @@ public final class AccessibilityTargetHelper {
return targets;
}
private static List<AccessibilityTarget> getWhiteListingFeatureTargets(Context context,
private static List<AccessibilityTarget> getAllowListingFeatureTargets(Context context,
@ShortcutType int shortcutType) {
final List<AccessibilityTarget> targets = new ArrayList<>();
final InvisibleToggleWhiteListingFeatureTarget magnification =
new InvisibleToggleWhiteListingFeatureTarget(context,
final InvisibleToggleAllowListingFeatureTarget magnification =
new InvisibleToggleAllowListingFeatureTarget(context,
shortcutType,
isShortcutContained(context, shortcutType, MAGNIFICATION_CONTROLLER_NAME),
MAGNIFICATION_CONTROLLER_NAME,
@@ -210,8 +210,8 @@ public final class AccessibilityTargetHelper {
context.getDrawable(R.drawable.ic_accessibility_magnification),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED);
final ToggleWhiteListingFeatureTarget daltonizer =
new ToggleWhiteListingFeatureTarget(context,
final ToggleAllowListingFeatureTarget daltonizer =
new ToggleAllowListingFeatureTarget(context,
shortcutType,
isShortcutContained(context, shortcutType,
DALTONIZER_COMPONENT_NAME.flattenToString()),
@@ -220,8 +220,8 @@ public final class AccessibilityTargetHelper {
context.getDrawable(R.drawable.ic_accessibility_color_correction),
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
final ToggleWhiteListingFeatureTarget colorInversion =
new ToggleWhiteListingFeatureTarget(context,
final ToggleAllowListingFeatureTarget colorInversion =
new ToggleAllowListingFeatureTarget(context,
shortcutType,
isShortcutContained(context, shortcutType,
COLOR_INVERSION_COMPONENT_NAME.flattenToString()),
@@ -231,8 +231,8 @@ public final class AccessibilityTargetHelper {
Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED);
// TODO: Update with shortcut icon
final ToggleWhiteListingFeatureTarget reduceBrightColors =
new ToggleWhiteListingFeatureTarget(context,
final ToggleAllowListingFeatureTarget reduceBrightColors =
new ToggleAllowListingFeatureTarget(context,
shortcutType,
isShortcutContained(context, shortcutType,
REDUCE_BRIGHT_COLORS_COMPONENT_NAME.flattenToString()),

4
core/java/com/android/internal/accessibility/dialog/InvisibleToggleWhiteListingFeatureTarget.java → core/java/com/android/internal/accessibility/dialog/InvisibleToggleAllowListingFeatureTarget.java
View File

@@ -26,9 +26,9 @@ import com.android.internal.accessibility.common.ShortcutConstants.Accessibility
* Extension for {@link AccessibilityTarget} with {@link AccessibilityFragmentType#INVISIBLE_TOGGLE}
* type.
*/
class InvisibleToggleWhiteListingFeatureTarget extends AccessibilityTarget {
class InvisibleToggleAllowListingFeatureTarget extends AccessibilityTarget {
InvisibleToggleWhiteListingFeatureTarget(Context context, @ShortcutType int shortcutType,
InvisibleToggleAllowListingFeatureTarget(Context context, @ShortcutType int shortcutType,
boolean isShortcutSwitched, String id, CharSequence label, Drawable icon, String key) {
super(context, shortcutType, AccessibilityFragmentType.INVISIBLE_TOGGLE,
isShortcutSwitched, id, label, icon, key);

4
core/java/com/android/internal/accessibility/dialog/ToggleWhiteListingFeatureTarget.java → core/java/com/android/internal/accessibility/dialog/ToggleAllowListingFeatureTarget.java
View File

@@ -32,9 +32,9 @@ import com.android.internal.accessibility.dialog.TargetAdapter.ViewHolder;
* Extension for {@link AccessibilityTarget} with {@link AccessibilityFragmentType#TOGGLE}
* type.
*/
class ToggleWhiteListingFeatureTarget extends AccessibilityTarget {
class ToggleAllowListingFeatureTarget extends AccessibilityTarget {
ToggleWhiteListingFeatureTarget(Context context, @ShortcutType int shortcutType,
ToggleAllowListingFeatureTarget(Context context, @ShortcutType int shortcutType,
boolean isShortcutSwitched, String id, CharSequence label, Drawable icon, String key) {
super(context, shortcutType, AccessibilityFragmentType.TOGGLE,
isShortcutSwitched, id, label, icon, key);