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

Commit 70da69b0 authored by Salvador Martinez's avatar Salvador Martinez Committed by Android (Google) Code Review
Browse files

Merge "Update dark mode in accessiblity settings"

parents 23cb22a7 194abe94
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -58,12 +58,10 @@
            android:title="@string/screen_zoom_title"
            settings:searchable="false"/>

        <ListPreference
        <Preference
            android:key="dark_ui_mode_accessibility"
            android:fragment="com.android.settings.display.DarkUISettings"
            android:title="@string/dark_ui_mode"
            android:dialogTitle="@string/dark_ui_mode_title"
            android:entries="@array/dark_ui_mode_entries"
            android:entryValues="@array/dark_ui_mode_values"
            settings:searchable="false" />

        <Preference
+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
    private SwitchPreference mToggleInversionPreference;
    private ColorInversionPreferenceController mInversionPreferenceController;
    private AccessibilityHearingAidPreferenceController mHearingAidPreferenceController;
    private ListPreference mDarkUIModePreference;
    private Preference mDarkUIModePreference;
    private DarkUIPreferenceController mDarkUIPreferenceController;
    private LiveCaptionPreferenceController mLiveCaptionPreferenceController;

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public class AccessibilitySettingsTest {

    @Test
    public void testDarkUIModePreferenceSummary_shouldUpdateSummary() {
        final ListPreference darkUIModePreference = new ListPreference(mContext);
        final Preference darkUIModePreference = new Preference(mContext);
        final DarkUIPreferenceController mController;
        doReturn(darkUIModePreference).when(mSettings).findPreference(
            DARK_UI_MODE_PREFERENCE);