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

Commit 242b3b8a authored by Menghan Li's avatar Menghan Li Committed by Android (Google) Code Review
Browse files

Merge changes I97841c5b,I64e47f92 into main 

* changes:
  feat(EDT): Update the preference interaction and visiblity logic
  feat(EDT): Migrate entry into Display Settings
parents 8e86a05e dfb3c5b8

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -5460,9 +5460,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,

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

+17 −11
Original line number Diff line number Diff line
@@ -16,11 +16,16 @@ 


package com.android.settings.accessibility;



import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;

import static com.android.settings.accessibility.AccessibilityUtil.State.ON;



import android.content.Context;

import android.content.res.Configuration;

import android.provider.Settings;

import android.view.accessibility.Flags;



import androidx.annotation.VisibleForTesting;

import androidx.annotation.NonNull;

import androidx.preference.Preference;



import com.android.settings.R;

import com.android.settings.core.TogglePreferenceController;
@@ -28,27 +33,28 @@ import com.android.settings.core.TogglePreferenceController; 
/** A toggle preference controller for force invert (force dark). */

public class ToggleForceInvertPreferenceController extends TogglePreferenceController {



    public static final String SETTINGS_KEY =

            Settings.Secure.ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED;



    @VisibleForTesting

    static final int ON = 1;

    @VisibleForTesting

    static final int OFF = 0;



    public ToggleForceInvertPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

    }



    @Override

    public boolean isChecked() {

        return Settings.Secure.getInt(mContext.getContentResolver(), SETTINGS_KEY, OFF) != OFF;

        return Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED, OFF) != OFF;

    }



    @Override

    public boolean setChecked(boolean isChecked) {

        return Settings.Secure.putInt(mContext.getContentResolver(),

                SETTINGS_KEY, isChecked ? ON : OFF);

                Settings.Secure.ACCESSIBILITY_FORCE_INVERT_COLOR_ENABLED, isChecked ? ON : OFF);

    }



    @Override

    public void updateState(@NonNull Preference preference) {

        super.updateState(preference);

        final boolean isDarkModeActivated = (mContext.getResources().getConfiguration().uiMode

                & Configuration.UI_MODE_NIGHT_YES) != 0;

        preference.setEnabled(isDarkModeActivated);

    }



    @Override