Merge "Add turn screen darker fragment in a11y settings text and display" into sc-dev
This commit is contained in:
TreeHugger Robot
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
a97f011ba3
@@ -21,18 +21,33 @@
|
||||
android:persistent="false"
|
||||
android:title="@string/accessibility_text_and_display_title">
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_high_text_contrast_preference"
|
||||
<Preference
|
||||
android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
|
||||
android:key="font_size_preference_screen"
|
||||
android:persistent="false"
|
||||
android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
|
||||
settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
|
||||
android:title="@string/title_font_size"
|
||||
settings:controller="com.android.settings.display.FontSizePreferenceController"
|
||||
settings:searchable="false"/>
|
||||
|
||||
<com.android.settings.display.ScreenZoomPreference
|
||||
android:fragment="com.android.settings.display.ScreenZoomSettings"
|
||||
android:key="accessibility_settings_screen_zoom"
|
||||
android:persistent="false"
|
||||
android:title="@string/screen_zoom_title"
|
||||
settings:searchable="false"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="dark_ui_mode_accessibility"
|
||||
android:key="toggle_force_bold_text"
|
||||
android:persistent="false"
|
||||
android:title="@string/dark_ui_mode"
|
||||
settings:controller="com.android.settings.display.DarkUIPreferenceController"
|
||||
settings:searchable="false"/>
|
||||
android:title="@string/force_bold_text"
|
||||
settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.TurnScreenDarkerFragment"
|
||||
android:key="turn_screen_darker_preference_screen"
|
||||
android:persistent="false"
|
||||
android:title="@string/accessibility_turn_screen_darker_title"
|
||||
settings:searchable="true"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
|
||||
@@ -42,21 +57,11 @@
|
||||
android:title="@string/accessibility_display_daltonizer_preference_title"
|
||||
settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.ToggleColorInversionPreferenceFragment"
|
||||
android:icon="@drawable/ic_color_inversion"
|
||||
android:key="toggle_inversion_preference"
|
||||
<SwitchPreference
|
||||
android:key="toggle_high_text_contrast_preference"
|
||||
android:persistent="false"
|
||||
android:title="@string/accessibility_display_inversion_preference_title"
|
||||
settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
|
||||
|
||||
<!--TODO(b/170973645): Get icon-->
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment"
|
||||
android:key="reduce_bright_colors_preference"
|
||||
android:persistent="false"
|
||||
android:title="@string/reduce_bright_colors_preference_title"
|
||||
settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"/>
|
||||
android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
|
||||
settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_disable_animations"
|
||||
@@ -64,27 +69,6 @@
|
||||
android:title="@string/accessibility_disable_animations"
|
||||
settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>
|
||||
|
||||
<com.android.settings.display.ScreenZoomPreference
|
||||
android:fragment="com.android.settings.display.ScreenZoomSettings"
|
||||
android:key="accessibility_settings_screen_zoom"
|
||||
android:persistent="false"
|
||||
android:title="@string/screen_zoom_title"
|
||||
settings:searchable="false"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
|
||||
android:key="font_size_preference_screen"
|
||||
android:persistent="false"
|
||||
android:title="@string/title_font_size"
|
||||
settings:controller="com.android.settings.display.FontSizePreferenceController"
|
||||
settings:searchable="false"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_force_bold_text"
|
||||
android:persistent="false"
|
||||
android:title="@string/force_bold_text"
|
||||
settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_large_pointer_icon"
|
||||
android:persistent="false"
|
||||
@@ -94,7 +78,6 @@
|
||||
<PreferenceCategory
|
||||
android:key="experimental_category"
|
||||
android:persistent="false"
|
||||
android:title="@string/experimental_category_title"
|
||||
settings:initialExpandedChildrenCount="1">
|
||||
android:title="@string/experimental_category_title">
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
66
res/xml/accessibility_turn_screen_darker.xml
Normal file
66
res/xml/accessibility_turn_screen_darker.xml
Normal file
@@ -0,0 +1,66 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- 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.
|
||||
-->
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="accessibility_turn_screen_darker"
|
||||
android:persistent="false"
|
||||
android:title="@string/accessibility_turn_screen_darker_title">
|
||||
|
||||
<SwitchPreference
|
||||
android:key="dark_ui_mode_accessibility"
|
||||
android:persistent="false"
|
||||
android:title="@string/dark_ui_mode"
|
||||
settings:controller="com.android.settings.display.DarkUIPreferenceController"
|
||||
settings:searchable="false"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.ToggleColorInversionPreferenceFragment"
|
||||
android:icon="@drawable/ic_color_inversion"
|
||||
android:key="toggle_inversion_preference"
|
||||
android:persistent="false"
|
||||
android:title="@string/accessibility_display_inversion_preference_title"
|
||||
settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
|
||||
|
||||
<!--TODO(b/170973645): Get icon-->
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment"
|
||||
android:key="reduce_bright_colors_preference"
|
||||
android:persistent="false"
|
||||
android:title="@string/reduce_bright_colors_preference_title"
|
||||
settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"/>
|
||||
|
||||
<Preference
|
||||
android:key="auto_brightness_entry"
|
||||
android:title="@string/auto_brightness_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:fragment="com.android.settings.display.AutoBrightnessSettings"
|
||||
settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
|
||||
|
||||
<com.android.settings.widget.PrimarySwitchPreference
|
||||
android:key="night_display"
|
||||
android:title="@string/night_display_title"
|
||||
android:fragment="com.android.settings.display.NightDisplaySettings"
|
||||
settings:controller="com.android.settings.display.NightDisplayPreferenceController"
|
||||
settings:keywords="@string/keywords_display_night_display"/>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="experimental_category"
|
||||
android:persistent="false"
|
||||
android:title="@string/experimental_category_title">
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
Reference in New Issue
Block a user