Fix Master: Add settings for scheduling dark theme
Adding a settings page similar to night light for Dark theme. it will allow the user to schedule dark mode from sunrise to sunset Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \ make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \ make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \ make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest" Fixes: 141567787 Change-Id: Iee5d020ac6ea093be712a4f191d4601c9d4617fa
This commit is contained in:
49
res/xml/dark_mode_settings.xml
Normal file
49
res/xml/dark_mode_settings.xml
Normal file
@@ -0,0 +1,49 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2019 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:title="@string/dark_ui_mode"
|
||||
android:key="dark_ui_mode_screen"
|
||||
settings:keywords="@string/keywords_dark_ui_mode">
|
||||
|
||||
<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:controller="com.android.settings.display.darkmode.DarkModeScheduleSelectorController"
|
||||
settings:keywords="@string/keywords_dark_ui_mode"/>
|
||||
|
||||
<com.android.settingslib.widget.LayoutPreference
|
||||
android:key="dark_ui_activated"
|
||||
android:title="@string/dark_ui_title"
|
||||
android:selectable="false"
|
||||
android:layout="@layout/dark_ui_activation_button"
|
||||
settings:allowDividerBelow="true"
|
||||
settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"
|
||||
settings:keywords="@string/keywords_dark_ui_mode"/>
|
||||
|
||||
<com.android.settingslib.widget.FooterPreference
|
||||
android:key="dark_ui_footer"
|
||||
android:title="@string/dark_ui_text"
|
||||
android:selectable="false"
|
||||
settings:searchable="false"
|
||||
settings:allowDividerAbove="true"/>
|
||||
|
||||
</PreferenceScreen>
|
@@ -21,4 +21,4 @@
|
||||
android:key="dark_ui_mode_screen"
|
||||
settings:staticPreferenceLocation="append"
|
||||
settings:keywords="@string/keywords_dark_ui_mode">
|
||||
</PreferenceScreen >
|
||||
</PreferenceScreen >
|
@@ -31,6 +31,15 @@
|
||||
<intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
|
||||
</com.android.settingslib.RestrictedPreference>
|
||||
|
||||
<com.android.settings.display.darkmode.DarkModePreference
|
||||
android:key="dark_ui_mode"
|
||||
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"/>
|
||||
|
||||
<com.android.settings.display.NightDisplayPreference
|
||||
android:key="night_display"
|
||||
android:title="@string/night_display_title"
|
||||
@@ -54,13 +63,6 @@
|
||||
settings:controller="com.android.settings.display.WallpaperPreferenceController">
|
||||
</com.android.settingslib.RestrictedPreference>
|
||||
|
||||
|
||||
<SwitchPreference
|
||||
android:key="dark_ui_mode"
|
||||
android:title="@string/dark_ui_mode"
|
||||
settings:keywords="@string/keywords_dark_ui_mode"
|
||||
settings:controller="com.android.settings.display.DarkUIPreferenceController"/>
|
||||
|
||||
<!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
|
||||
<com.android.settings.display.TimeoutListPreference
|
||||
android:key="screen_timeout"
|
||||
|
Reference in New Issue
Block a user