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

Merge "Re-order the display settings items." into oc-dev

Browse Source
This commit is contained in:
Doris Ling
2017-04-06 17:01:45 +00:00
committed by Android (Google) Code Review
parent 24596f51d5 11b224e34f
commit 5a03e321bc
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
res/xml/display_settings.xml
View File

@@ -27,6 +27,19 @@
<intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" /> <intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
</Preference> </Preference>
<com.android.settings.display.NightDisplayPreference
android:key="night_display"
android:title="@string/night_display_title"
android:fragment="com.android.settings.display.NightDisplaySettings"
settings:widgetLayout="@null"
settings:keywords="@string/keywords_display_night_display" />
<SwitchPreference
android:key="auto_brightness"
android:title="@string/auto_brightness_title"
settings:keywords="@string/keywords_display_auto_brightness"
android:summary="@string/auto_brightness_summary" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="wallpaper" android:key="wallpaper"
android:title="@string/wallpaper_settings_title" android:title="@string/wallpaper_settings_title"
@@ -37,13 +50,6 @@
android:targetClass="@string/config_wallpaper_picker_class" /> android:targetClass="@string/config_wallpaper_picker_class" />
</com.android.settingslib.RestrictedPreference> </com.android.settingslib.RestrictedPreference>
<com.android.settings.display.NightDisplayPreference
android:key="night_display"
android:title="@string/night_display_title"
android:fragment="com.android.settings.display.NightDisplaySettings"
settings:widgetLayout="@null"
settings:keywords="@string/keywords_display_night_display" />
<com.android.settings.TimeoutListPreference <com.android.settings.TimeoutListPreference
android:key="screen_timeout" android:key="screen_timeout"
android:title="@string/screen_timeout" android:title="@string/screen_timeout"
@@ -56,12 +62,6 @@
android:summary="%s" android:summary="%s"
android:title="@string/display_auto_rotate_title" /> android:title="@string/display_auto_rotate_title" />
<SwitchPreference
android:key="auto_brightness"
android:title="@string/auto_brightness_title"
settings:keywords="@string/keywords_display_auto_brightness"
android:summary="@string/auto_brightness_summary" />
<Preference <Preference
android:key="font_size" android:key="font_size"
android:title="@string/title_font_size" android:title="@string/title_font_size"