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

Commit 9aa9199f authored by Menghan Li's avatar Menghan Li
Browse files

feat(EDT): Migrate entry into Display Settings 

The EDT toggle will be an subsetting in the DarkTheme settings page
- When the Dark Theme main toggle is on, we check the EDT setting to
decide applying normal DarkTheme or EDT now.
- The EDT preference is disabled when DarkTheme is off

Bug: 368721320
Flag: android.view.accessibility.force_invert_color
Test: atest ToggleForceInvertPreferenceControllerTest
            DarkModeSettingsFragmentTest
Change-Id: I64e47f92b14ee24a91f469cb55c7bb1285f05c62
parent 6123cb9a

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -5398,9 +5398,9 @@ 
    <!-- Summary for the accessibility preference for enabling/disabling large icons for mouse/trackpad pointers. [CHAR LIMIT=60] -->

    <string name="accessibility_toggle_large_pointer_icon_summary">Make the mouse pointer more noticeable</string>

    <!-- Title for the accessibility preference for forcing all apps to use dark theme. [CHAR LIMIT=35] -->

    <string name="accessibility_force_invert_title">Make all apps dark</string>

    <string name="accessibility_force_invert_title">Make more apps dark</string>

    <!-- Summary for the accessibility preference for forcing all apps to use dark theme. [CHAR LIMIT=100] -->

    <string name="accessibility_force_invert_summary">Applies to apps without their own dark theme. Some apps may have display issues, like inverted colors.</string>

    <string name="accessibility_force_invert_summary">Automatically convert light theme apps to dark theme</string>

    <!-- Title for the accessibility preference for disabling animations. [CHAR LIMIT=35] -->

    <string name="accessibility_disable_animations">Remove animations</string>

    <!-- Summary for the accessibility preference for disabling animations. [CHAR LIMIT=60] -->

res/xml/accessibility_color_and_motion.xml

+0 −8
Original line number Diff line number Diff line
@@ -51,14 +51,6 @@ 
        settings:controller="com.android.settings.display.DarkUIPreferenceController"

        settings:searchable="false"/>



    <SwitchPreferenceCompat

        android:icon="@drawable/ic_dark_ui"

        android:key="toggle_force_invert"

        android:persistent="false"

        android:summary="@string/accessibility_force_invert_summary"

        android:title="@string/accessibility_force_invert_title"

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



    <SwitchPreferenceCompat

        android:icon="@drawable/ic_accessibility_animation"

        android:key="animator_duration_scale"

res/xml/dark_mode_settings.xml

+27 −17
Original line number Diff line number Diff line
@@ -35,13 +35,22 @@ 
        android:title="@string/twilight_mode_location_off_dialog_message"

        settings:controller="com.android.settings.display.TwilightLocationPreferenceController"/>



    <PreferenceCategory

        android:key="display_category"

        android:title="@string/accessibility_screen_option">



        <SwitchPreferenceCompat

            android:key="toggle_force_invert"

            android:summary="@string/accessibility_force_invert_summary"

            android:title="@string/accessibility_force_invert_title"

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



        <DropDownPreference

            android:key="dark_ui_auto_mode"

            android:title="@string/dark_ui_auto_mode_title"

            android:summary="%s"

            android:entries="@array/dark_ui_scheduler_preference_titles"

            android:entryValues="@array/dark_ui_scheduler_preference_titles"

        settings:allowDividerAbove="true"

            settings:controller="com.android.settings.display.darkmode.DarkModeScheduleSelectorController"

            settings:keywords="@string/keywords_dark_ui_mode"/>
@@ -54,6 +63,7 @@ 
            android:key="dark_theme_end_time"

            android:title="@string/night_display_end_time_title"

            settings:searchable="false"/>

    </PreferenceCategory>



    <com.android.settingslib.widget.FooterPreference

        android:key="dark_theme_custom_bedtime_footer"

src/com/android/settings/accessibility/ColorAndMotionFragment.java

+0 −7
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.hardware.display.ColorDisplayManager; 
import android.os.Bundle;

import android.os.Handler;

import android.provider.Settings;

import android.view.accessibility.Flags;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -30,7 +29,6 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceCategory;

import androidx.preference.TwoStatePreference;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +49,6 @@ public class ColorAndMotionFragment extends DashboardFragment { 
    // Preferences

    private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN = "daltonizer_preference";

    private static final String TOGGLE_LARGE_POINTER_ICON = "toggle_large_pointer_icon";

    @VisibleForTesting

    static final String TOGGLE_FORCE_INVERT = "toggle_force_invert";



    private Preference mDisplayDaltonizerPreferenceScreen;

    private TwoStatePreference mToggleDisableAnimationsPreference;
@@ -77,9 +73,6 @@ public class ColorAndMotionFragment extends DashboardFragment { 
        mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE);

        mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS);

        mShortcutFeatureKeys.add(Settings.Secure.ACCESSIBILITY_QS_TARGETS);

        if (Flags.forceInvertColor()) {

            mShortcutFeatureKeys.add(ToggleForceInvertPreferenceController.SETTINGS_KEY);

        }



        mSettingsContentObserver = new AccessibilitySettingsContentObserver(new Handler());

        mSettingsContentObserver.registerKeysToObserverCallback(mShortcutFeatureKeys,

tests/robotests/src/com/android/settings/accessibility/ColorAndMotionFragmentTest.java

+0 −19
Original line number Diff line number Diff line
@@ -16,14 +16,10 @@ 


package com.android.settings.accessibility;



import static android.view.accessibility.Flags.FLAG_FORCE_INVERT_COLOR;



import static com.google.common.truth.Truth.assertThat;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;
@@ -73,20 +69,6 @@ public class ColorAndMotionFragmentTest { 
    }



    @Test

    @RequiresFlagsEnabled(FLAG_FORCE_INVERT_COLOR)

    public void forceInvertEnabled_getNonIndexableKeys_existInXmlLayout() {

        final List<String> niks = ColorAndMotionFragment.SEARCH_INDEX_DATA_PROVIDER

                .getNonIndexableKeys(mContext);

        final List<String> keys =

                XmlTestUtils.getKeysFromPreferenceXml(mContext,

                        R.xml.accessibility_color_and_motion);



        assertThat(niks).doesNotContain(ColorAndMotionFragment.TOGGLE_FORCE_INVERT);

        assertThat(keys).containsAtLeastElementsIn(niks);

    }



    @Test

    @RequiresFlagsDisabled(FLAG_FORCE_INVERT_COLOR)

    public void getNonIndexableKeys_existInXmlLayout() {

        final List<String> niks = ColorAndMotionFragment.SEARCH_INDEX_DATA_PROVIDER

                .getNonIndexableKeys(mContext);
@@ -94,7 +76,6 @@ public class ColorAndMotionFragmentTest { 
                XmlTestUtils.getKeysFromPreferenceXml(mContext,

                        R.xml.accessibility_color_and_motion);



        assertThat(niks).contains(ColorAndMotionFragment.TOGGLE_FORCE_INVERT);

        assertThat(keys).containsAtLeastElementsIn(niks);

    }

}