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

Merge "[Contrast] Migrate contrast settings into Display" into main

Browse Source
This commit is contained in:
Marcus Ge
2024-05-10 15:23:47 +00:00
committed by Android (Google) Code Review
parent 59e2bce852 24289fa084
commit fd0dd5dfdd
15 changed files with 103 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/xml/accessibility_color_and_motion.xml
View File

@@ -21,16 +21,6 @@
android:persistent="false"
android:title="@string/accessibility_color_and_motion_title">
<Preference
android:fragment="com.android.settings.accessibility.ColorContrastFragment"
android:key="color_contrast"
android:icon="@drawable/ic_color_contrast"
android:persistent="false"
android:title="@string/accessibility_color_contrast_title"
android:summary="@string/accessibility_color_contrast_summary"
settings:controller="com.android.settings.accessibility.ContrastPreferenceController"
settings:searchable="true"/>
<Preference
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
android:icon="@drawable/ic_daltonizer"

4
res/xml/accessibility_color_contrast.xml
View File

@@ -28,7 +28,7 @@
android:key="color_contrast_selector"
android:selectable="false"
android:layout="@layout/accessibility_color_contrast_selector"
settings:controller="com.android.settings.accessibility.ContrastSelectorPreferenceController" />
settings:controller="com.android.settings.display.ContrastSelectorPreferenceController" />
<SwitchPreferenceCompat
android:key="toggle_high_text_contrast_preference"
@@ -43,6 +43,6 @@
android:title="@string/color_contrast_note"
android:selectable="false"
settings:searchable="false"
settings:controller="com.android.settings.accessibility.ColorContrastFooterPreferenceController" />
settings:controller="com.android.settings.display.ColorContrastFooterPreferenceController" />
</PreferenceScreen>

8
res/xml/display_settings.xml
View File

@@ -111,6 +111,14 @@
android:fragment="com.android.settings.display.ColorModePreferenceFragment"
settings:controller="com.android.settings.display.ColorModePreferenceController"
settings:keywords="@string/keywords_color_mode"/>
<Preference
android:fragment="com.android.settings.display.ColorContrastFragment"
android:key="color_contrast"
android:persistent="false"
android:title="@string/accessibility_color_contrast_title"
settings:controller="com.android.settings.display.ContrastPreferenceController"
settings:searchable="true"/>
</PreferenceCategory>
<PreferenceCategory