<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="display_settings_screen"
android:title="@string/display_settings"
- settings:keywords="@string/keywords_display">
+ settings:keywords="@string/keywords_display"
+ settings:initialExpandedChildrenCount="5">
- <Preference
+ <com.android.settingslib.RestrictedPreference
android:key="brightness"
android:title="@string/brightness"
- settings:keywords="@string/keywords_display_brightness_level">
+ settings:keywords="@string/keywords_display_brightness_level"
+ settings:useAdminDisabledSummary="true"
+ settings:userRestriction="no_config_brightness">
<intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
- </Preference>
+ </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:fragment="com.android.settings.display.NightDisplaySettings"
android:widgetLayout="@null"
settings:widgetLayout="@null"
- settings:keywords="@string/keywords_display_night_display" />
+ settings:searchable="false" />
- <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
- <SwitchPreference
- android:key="auto_brightness"
+ <Preference
+ android:key="auto_brightness_entry"
android:title="@string/auto_brightness_title"
- settings:keywords="@string/keywords_display_auto_brightness"
- android:summary="@string/auto_brightness_summary" />
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.display.AutoBrightnessSettings"
+ settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
<com.android.settingslib.RestrictedPreference
android:key="wallpaper"
android:title="@string/wallpaper_settings_title"
settings:keywords="@string/keywords_display_wallpaper"
- settings:useAdminDisabledSummary="true">
- <intent
- android:targetPackage="@string/config_wallpaper_picker_package"
- android:targetClass="@string/config_wallpaper_picker_class" />
+ settings:useAdminDisabledSummary="true"
+ settings:controller="com.android.settings.display.WallpaperPreferenceController">
</com.android.settingslib.RestrictedPreference>
<!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
- <com.android.settings.TimeoutListPreference
+ <com.android.settings.display.TimeoutListPreference
android:key="screen_timeout"
android:title="@string/screen_timeout"
android:summary="@string/summary_placeholder"
android:entries="@array/screen_timeout_entries"
- android:entryValues="@array/screen_timeout_values" />
+ android:entryValues="@array/screen_timeout_values"
+ settings:keywords="@string/keywords_screen_timeout" />
+
+ <Preference
+ android:key="adaptive_sleep_entry"
+ android:title="@string/adaptive_sleep_title"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.display.AdaptiveSleepSettings"
+ settings:controller="com.android.settings.display.AdaptiveSleepPreferenceController" />
<SwitchPreference
android:key="auto_rotate"
- android:title="@string/accelerometer_title" />
+ android:title="@string/accelerometer_title"
+ settings:keywords="@string/keywords_auto_rotate"
+ settings:controller="com.android.settings.display.AutoRotatePreferenceController" />
<Preference
android:key="color_mode"
android:title="@string/color_mode_title"
android:fragment="com.android.settings.display.ColorModePreferenceFragment"
+ settings:controller="com.android.settings.display.ColorModePreferenceController"
settings:keywords="@string/keywords_color_mode" />
+ <SwitchPreference
+ android:key="display_white_balance"
+ android:title="@string/display_white_balance_title"
+ android:summary="@string/display_white_balance_summary"
+ settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController" />
+
<Preference
android:key="font_size"
android:title="@string/title_font_size"
- android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
- settings:keywords="@string/keywords_display_font_size" />
+ android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
+ settings:controller="com.android.settings.display.FontSizePreferenceController" />
<com.android.settings.display.ScreenZoomPreference
- android:key="screen_zoom"
+ android:key="display_settings_screen_zoom"
android:title="@string/screen_zoom_title"
- settings:keywords="@string/screen_zoom_keywords" />
+ android:fragment="com.android.settings.display.ScreenZoomSettings"
+ settings:searchable="false"/>
+
+ <SwitchPreference
+ android:key="show_operator_name"
+ android:title="@string/show_operator_name_title"
+ android:summary="@string/show_operator_name_summary" />
<Preference
android:key="screensaver"
android:title="@string/screensaver_settings_title"
- android:fragment="com.android.settings.dream.DreamSettings" />
+ android:fragment="com.android.settings.dream.DreamSettings"
+ settings:searchable="false" />
- <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
<Preference
- android:key="ambient_display"
- android:title="@string/ambient_display_screen_title"
- android:fragment="com.android.settings.display.AmbientDisplaySettings" />
-
- <!-- Hide night mode for now
- <ListPreference
- android:key="night_mode"
- android:title="@string/night_mode_title"
- settings:keywords="@string/keywords_display_night_mode"
- android:summary="@string/night_mode_summary"
- android:entries="@array/night_mode_entries"
- android:entryValues="@array/night_mode_values" /> -->
+ android:key="lockscreen_from_display_settings"
+ android:title="@string/lockscreen_settings_title"
+ android:fragment="com.android.settings.security.LockscreenDashboardFragment"
+ settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController" />
<SwitchPreference
android:key="camera_gesture"