From b5248c1f92094244fe017b532bea2beea9f1e26f Mon Sep 17 00:00:00 2001 From: Sally Date: Tue, 13 Oct 2020 18:19:11 +0000 Subject: [PATCH] Use inclusive language Test: builds Bug: na Change-Id: I014007bccfa2671c2887a3f239ed0e87b80c01ce --- .../dialog/AccessibilityTargetHelper.java | 20 +++++++++---------- ...sibleToggleAllowListingFeatureTarget.java} | 4 ++-- ...a => ToggleAllowListingFeatureTarget.java} | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) rename core/java/com/android/internal/accessibility/dialog/{InvisibleToggleWhiteListingFeatureTarget.java => InvisibleToggleAllowListingFeatureTarget.java} (91%) rename core/java/com/android/internal/accessibility/dialog/{ToggleWhiteListingFeatureTarget.java => ToggleAllowListingFeatureTarget.java} (94%) diff --git a/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java b/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java index 2632e4b61d843..9d06bb92b2056 100644 --- a/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java +++ b/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java @@ -113,7 +113,7 @@ public final class AccessibilityTargetHelper { @ShortcutType int shortcutType) { final List 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 getWhiteListingFeatureTargets(Context context, + private static List getAllowListingFeatureTargets(Context context, @ShortcutType int shortcutType) { final List 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()), diff --git a/core/java/com/android/internal/accessibility/dialog/InvisibleToggleWhiteListingFeatureTarget.java b/core/java/com/android/internal/accessibility/dialog/InvisibleToggleAllowListingFeatureTarget.java similarity index 91% rename from core/java/com/android/internal/accessibility/dialog/InvisibleToggleWhiteListingFeatureTarget.java rename to core/java/com/android/internal/accessibility/dialog/InvisibleToggleAllowListingFeatureTarget.java index acd101bf28bac..e78036d9f1e9b 100644 --- a/core/java/com/android/internal/accessibility/dialog/InvisibleToggleWhiteListingFeatureTarget.java +++ b/core/java/com/android/internal/accessibility/dialog/InvisibleToggleAllowListingFeatureTarget.java @@ -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); diff --git a/core/java/com/android/internal/accessibility/dialog/ToggleWhiteListingFeatureTarget.java b/core/java/com/android/internal/accessibility/dialog/ToggleAllowListingFeatureTarget.java similarity index 94% rename from core/java/com/android/internal/accessibility/dialog/ToggleWhiteListingFeatureTarget.java rename to core/java/com/android/internal/accessibility/dialog/ToggleAllowListingFeatureTarget.java index 5ab9eb84f0e46..38aac708de15d 100644 --- a/core/java/com/android/internal/accessibility/dialog/ToggleWhiteListingFeatureTarget.java +++ b/core/java/com/android/internal/accessibility/dialog/ToggleAllowListingFeatureTarget.java @@ -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);