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

Commit a92e6d89 authored by PETER LIANG's avatar PETER LIANG Committed by Android (Google) Code Review
Browse files

Merge "Move the "Dark theme" preference into the "Color and Motion" page." into tm-dev

parents 73b858db 566ba7c3

res/xml/accessibility_color_and_motion.xml

+10 −0
Original line number Diff line number Diff line
@@ -39,6 +39,16 @@ 
        settings:keywords="@string/keywords_color_inversion"

        settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>



    <com.android.settings.display.darkmode.DarkModePreference

        android:key="dark_ui_mode_accessibility"

        android:icon="@drawable/ic_dark_ui"

        android:title="@string/dark_ui_mode"

        android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"

        android:widgetLayout="@null"

        settings:widgetLayout="@null"

        settings:controller="com.android.settings.display.DarkUIPreferenceController"

        settings:searchable="false"/>



    <SwitchPreference

        android:key="toggle_disable_animations"

        android:persistent="false"

res/xml/accessibility_settings.xml

+0 −10
Original line number Diff line number Diff line
@@ -60,16 +60,6 @@ 
            settings:keywords="@string/keywords_reduce_bright_colors"

            settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"/>



        <com.android.settings.display.darkmode.DarkModePreference

            android:key="dark_ui_mode_accessibility"

            android:icon="@drawable/ic_dark_ui"

            android:title="@string/dark_ui_mode"

            android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"

            android:widgetLayout="@null"

            settings:widgetLayout="@null"

            settings:controller="com.android.settings.display.DarkUIPreferenceController"

            settings:searchable="false"/>



        <Preference

            android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"

            android:key="magnification_preference_screen"