From 11b224e34f3732e1e5f3cb9179108cab550538d7 Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Fri, 31 Mar 2017 13:14:03 -0700
Subject: [PATCH] Re-order the display settings items.

Move Night light and Adaptive brightness up.

Change-Id: Ic5302e26e1c5c6c74fea955ad90723c2eeb94a31
Fix: 35959978
Test: visual
---
 res/xml/display_settings.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 71825b17e8..9d4acb4955 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -27,6 +27,19 @@
         <intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
     </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
         android:key="wallpaper"
         android:title="@string/wallpaper_settings_title"
@@ -37,13 +50,6 @@
             android:targetClass="@string/config_wallpaper_picker_class" />
     </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
         android:key="screen_timeout"
         android:title="@string/screen_timeout"
@@ -56,12 +62,6 @@
         android:summary="%s"
         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
         android:key="font_size"
         android:title="@string/title_font_size"
-- 
2.11.0