PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move dark theme above advanced"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-13 00:01:07 +00:00
committed by Android (Google) Code Review
parent 774b8394a0 b543662b39
commit 5c4eab4df2
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/xml/display_settings.xml
View File

@@ -20,7 +20,7 @@
android:key="display_settings_screen" android:key="display_settings_screen"
android:title="@string/display_settings" android:title="@string/display_settings"
settings:keywords="@string/keywords_display" settings:keywords="@string/keywords_display"
settings:initialExpandedChildrenCount="4"> settings:initialExpandedChildrenCount="5">
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="brightness" android:key="brightness"
@@ -57,6 +57,15 @@
android:targetClass="@string/config_wallpaper_picker_class" /> android:targetClass="@string/config_wallpaper_picker_class" />
</com.android.settingslib.RestrictedPreference> </com.android.settingslib.RestrictedPreference>
<ListPreference
android:key="dark_ui_mode"
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: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 --> <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
<com.android.settings.display.TimeoutListPreference <com.android.settings.display.TimeoutListPreference
android:key="screen_timeout" android:key="screen_timeout"
@@ -135,15 +144,6 @@
android:title="@string/tap_to_wake" android:title="@string/tap_to_wake"
android:summary="@string/tap_to_wake_summary" /> android:summary="@string/tap_to_wake_summary" />
<ListPreference
android:key="dark_ui_mode"
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:keywords="@string/keywords_dark_ui_mode"
settings:controller="com.android.settings.display.DarkUIPreferenceController" />
<ListPreference <ListPreference
android:key="theme" android:key="theme"
android:title="@string/device_theme" android:title="@string/device_theme"