Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e131718f authored by Sally's avatar Sally
Browse files

Add infrastructure for supporting Reduce Bright Colors as an A11y shortcut 

The RBC settings subpage will have a switch to assign RBC activation to this shortcut

BYPASS_INCLUSIVE_LANGUAGE_REASON=ag/12828007

Test: builds
Bug: b/128465252
Change-Id: I4f254374ebb531fe8657b262646299e2be635cf8
parent ebf288af

core/java/com/android/internal/accessibility/AccessibilityShortcutController.java

+7 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ public class AccessibilityShortcutController { 
            "com.android.server.accessibility.MagnificationController";

    public static final ComponentName MAGNIFICATION_COMPONENT_NAME =

            new ComponentName("com.android.server.accessibility", "Magnification");

    public static final ComponentName REDUCE_BRIGHT_COLORS_COMPONENT_NAME =

            new ComponentName("com.android.server.accessibility", "ReduceBrightColors");



    private static final AudioAttributes VIBRATION_ATTRIBUTES = new AudioAttributes.Builder()

            .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
@@ -126,6 +128,11 @@ public class AccessibilityShortcutController { 
                            Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,

                            "1" /* Value to enable */, "0" /* Value to disable */,

                            R.string.color_correction_feature_name));

            featuresMap.put(REDUCE_BRIGHT_COLORS_COMPONENT_NAME,

                    new ToggleableFrameworkFeatureInfo(

                            Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED,

                            "1" /* Value to enable */, "0" /* Value to disable */,

                            R.string.reduce_bright_colors_feature_name));

            sFrameworkShortcutFeaturesMap = Collections.unmodifiableMap(featuresMap);

        }

        return sFrameworkShortcutFeaturesMap;

core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java

+13 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.view.accessibility.AccessibilityManager.ACCESSIBILITY_BUTT 
import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME;

import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME;

import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;

import static com.android.internal.accessibility.AccessibilityShortcutController.REDUCE_BRIGHT_COLORS_COMPONENT_NAME;

import static com.android.internal.accessibility.util.AccessibilityUtils.getAccessibilityServiceFragmentType;

import static com.android.internal.accessibility.util.ShortcutUtils.isShortcutContained;
@@ -229,9 +230,21 @@ public final class AccessibilityTargetHelper { 
                context.getDrawable(R.drawable.ic_accessibility_color_inversion),

                Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED);



        // TODO: Update with shortcut icon

        final ToggleWhiteListingFeatureTarget reduceBrightColors =

                new ToggleWhiteListingFeatureTarget(context,

                        shortcutType,

                        isShortcutContained(context, shortcutType,

                                REDUCE_BRIGHT_COLORS_COMPONENT_NAME.flattenToString()),

                        REDUCE_BRIGHT_COLORS_COMPONENT_NAME.flattenToString(),

                        context.getString(R.string.reduce_bright_colors_feature_name),

                        null,

                        Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED);



        targets.add(magnification);

        targets.add(daltonizer);

        targets.add(colorInversion);

        targets.add(reduceBrightColors);



        return targets;

    }

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -4494,6 +4494,9 @@ 
     shown in the warning dialog about the accessibility shortcut. -->

    <string name="color_correction_feature_name">Color Correction</string>



    <!-- Title of Reduce Bright Colors feature, shown in the warning dialog about the accessibility shortcut. [CHAR LIMIT=none] -->

    <string name="reduce_bright_colors_feature_name">Reduce Bright Colors</string>



    <!-- Text in toast to alert the user that the accessibility shortcut turned on an accessibility service. [CHAR LIMIT=none] -->

    <string name="accessibility_shortcut_enabling_service">Held volume keys. <xliff:g id="service_name" example="TalkBack">%1$s</xliff:g> turned on.</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3249,6 +3249,7 @@ 
  <java-symbol type="string" name="accessibility_shortcut_disabling_service" />

  <java-symbol type="string" name="color_inversion_feature_name" />

  <java-symbol type="string" name="color_correction_feature_name" />

  <java-symbol type="string" name="reduce_bright_colors_feature_name" />

  <java-symbol type="string" name="config_defaultAccessibilityService" />

  <java-symbol type="string" name="accessibility_shortcut_spoken_feedback" />