diff options
| -rw-r--r-- | core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java | 3 | ||||
| -rw-r--r-- | core/res/res/drawable/ic_accessibility_reduce_bright_colors.xml | 63 | ||||
| -rw-r--r-- | core/res/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/dimens.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
5 files changed, 73 insertions, 3 deletions
diff --git a/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java b/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java index 9d06bb92b205..0854955a92d5 100644 --- a/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java +++ b/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java @@ -230,7 +230,6 @@ public final class AccessibilityTargetHelper { context.getDrawable(R.drawable.ic_accessibility_color_inversion), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED); - // TODO: Update with shortcut icon final ToggleAllowListingFeatureTarget reduceBrightColors = new ToggleAllowListingFeatureTarget(context, shortcutType, @@ -238,7 +237,7 @@ public final class AccessibilityTargetHelper { REDUCE_BRIGHT_COLORS_COMPONENT_NAME.flattenToString()), REDUCE_BRIGHT_COLORS_COMPONENT_NAME.flattenToString(), context.getString(R.string.reduce_bright_colors_feature_name), - null, + context.getDrawable(R.drawable.ic_accessibility_reduce_bright_colors), Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED); targets.add(magnification); diff --git a/core/res/res/drawable/ic_accessibility_reduce_bright_colors.xml b/core/res/res/drawable/ic_accessibility_reduce_bright_colors.xml new file mode 100644 index 000000000000..1e840d26ca13 --- /dev/null +++ b/core/res/res/drawable/ic_accessibility_reduce_bright_colors.xml @@ -0,0 +1,63 @@ +<!-- + Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="oval"> + <solid + android:color="@color/GM2_grey_700"/> + <size + android:height="@dimen/accessibility_icon_size" + android:width="@dimen/accessibility_icon_size"/> + </shape> + </item> + <item + android:gravity="center"> + <vector + android:width="@dimen/accessibility_icon_foreground_size" + android:height="@dimen/accessibility_icon_foreground_size" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:pathData="M17,12.1L15.59,10.69L13.05,13.22V7.05H11.05V13.22L8.51,10.69L7.1,12.1L12.05,17.05L17,12.1Z" + android:fillColor="#ffffff"/> + <path + android:pathData="M2.05,13.05H4.05C4.6,13.05 5.05,12.6 5.05,12.05C5.05,11.5 4.6,11.05 4.05,11.05H2.05C1.5,11.05 1.05,11.5 1.05,12.05C1.05,12.6 1.5,13.05 2.05,13.05Z" + android:fillColor="#ffffff"/> + <path + android:pathData="M20.05,13.05H22.05C22.6,13.05 23.05,12.6 23.05,12.05C23.05,11.5 22.6,11.05 22.05,11.05H20.05C19.5,11.05 19.05,11.5 19.05,12.05C19.05,12.6 19.5,13.05 20.05,13.05Z" + android:fillColor="#ffffff"/> + <path + android:pathData="M11.05,2.05V4.05C11.05,4.6 11.5,5.05 12.05,5.05C12.6,5.05 13.05,4.6 13.05,4.05V2.05C13.05,1.5 12.6,1.05 12.05,1.05C11.5,1.05 11.05,1.5 11.05,2.05Z" + android:fillColor="#ffffff"/> + <path + android:pathData="M11.05,20.05V22.05C11.05,22.6 11.5,23.05 12.05,23.05C12.6,23.05 13.05,22.6 13.05,22.05V20.05C13.05,19.5 12.6,19.05 12.05,19.05C11.5,19.05 11.05,19.5 11.05,20.05Z" + android:fillColor="#ffffff"/> + <path + android:pathData="M6.04,4.63C5.65,4.24 5.01,4.24 4.63,4.63C4.24,5.02 4.24,5.66 4.63,6.04L5.69,7.1C6.08,7.49 6.72,7.49 7.1,7.1C7.49,6.71 7.49,6.07 7.1,5.69L6.04,4.63Z" + android:fillColor="#ffffff"/> + <path + android:pathData="M18.41,17C18.02,16.61 17.38,16.61 17,17C16.61,17.39 16.61,18.03 17,18.41L18.06,19.47C18.45,19.86 19.09,19.86 19.47,19.47C19.86,19.08 19.86,18.44 19.47,18.06L18.41,17Z" + android:fillColor="#ffffff"/> + <path + android:pathData="M19.47,6.04C19.86,5.65 19.86,5.01 19.47,4.63C19.08,4.24 18.44,4.24 18.06,4.63L17,5.69C16.61,6.08 16.61,6.72 17,7.1C17.39,7.49 18.03,7.49 18.41,7.1L19.47,6.04Z" + android:fillColor="#ffffff"/> + <path + android:pathData="M7.1,18.41C7.49,18.02 7.49,17.38 7.1,17C6.71,16.61 6.07,16.61 5.69,17L4.63,18.06C4.24,18.45 4.24,19.09 4.63,19.47C5.02,19.86 5.66,19.86 6.04,19.47L7.1,18.41Z" + android:fillColor="#ffffff"/> + </vector> + </item> +</layer-list> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 0213c60e9f60..3ad20c603115 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -231,7 +231,8 @@ <color name="chooser_gradient_background">@color/loading_gradient_background_color_light</color> <color name="chooser_gradient_highlight">@color/loading_gradient_highlight_color_light</color> - <color name="GM2_grey_800">#ff3C4043</color> + <color name="GM2_grey_700">#5F6368</color> + <color name="GM2_grey_800">#3C4043</color> <!-- Resolver/Chooser --> <color name="resolver_text_color_secondary_dark">#ffC4C6C6</color> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index fc2645c7c88b..e1ee761704cd 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -570,6 +570,12 @@ <!-- Width of the outline stroke used by the accessibility focus rectangle --> <dimen name="accessibility_focus_highlight_stroke_width">4dp</dimen> + <!-- The size of the Accessibility icon --> + <dimen name="accessibility_icon_size">32dp</dimen> + + <!-- The size of the Accessibility icon foreground part --> + <dimen name="accessibility_icon_foreground_size">18dp</dimen> + <!-- Margin around the various security views --> <dimen name="keyguard_muliuser_selector_margin">8dp</dimen> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 080202371a92..e7b292c6e7a8 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3378,6 +3378,7 @@ <java-symbol type="drawable" name="ic_accessibility_color_inversion" /> <java-symbol type="drawable" name="ic_accessibility_color_correction" /> <java-symbol type="drawable" name="ic_accessibility_magnification" /> + <java-symbol type="drawable" name="ic_accessibility_reduce_bright_colors" /> <java-symbol type="string" name="reduce_bright_colors_feature_name" /> |