From 71ca31cbac3c366e1483422f93ceba2d3f8e9985 Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Fri, 28 May 2021 14:03:10 +0800
Subject: [PATCH] Adjust layout of Display Settings

- Move TopIntroPreference up in Dark theme settings
- Move TopIntroPreference up in Night Light settings
- Move MainSwitchPreference under Illustaction in Adaptive brightness

Bug: 189390264
Bug: 189389913
Bug: 189384967

Test: visual verify
Change-Id: I32ba5bf94dfca705739994dc27d97f0d9caaad50
---
 res/xml/auto_brightness_detail.xml | 12 ++++++------
 res/xml/dark_mode_settings.xml     | 10 +++++-----
 res/xml/night_display_settings.xml | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/res/xml/auto_brightness_detail.xml b/res/xml/auto_brightness_detail.xml
index ebcf1741b77..d0bf3348666 100644
--- a/res/xml/auto_brightness_detail.xml
+++ b/res/xml/auto_brightness_detail.xml
@@ -20,12 +20,6 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/auto_brightness_title">
 
-    <com.android.settingslib.widget.MainSwitchPreference
-        android:key="auto_brightness"
-        android:title="@string/adaptive_brightness_main_switch_title"
-        settings:keywords="@string/keywords_display_auto_brightness"
-        settings:controller="com.android.settings.display.AutoBrightnessDetailPreferenceController"/>
-
     <com.android.settings.widget.VideoPreference
         android:key="auto_brightness_video"
         android:title="@string/summary_placeholder"
@@ -33,6 +27,12 @@
         settings:preview="@drawable/aab_brightness"
         settings:controller="com.android.settings.widget.VideoPreferenceController"/>
 
+    <com.android.settingslib.widget.MainSwitchPreference
+        android:key="auto_brightness"
+        android:title="@string/adaptive_brightness_main_switch_title"
+        settings:keywords="@string/keywords_display_auto_brightness"
+        settings:controller="com.android.settings.display.AutoBrightnessDetailPreferenceController"/>
+
     <com.android.settingslib.widget.FooterPreference
         android:key="auto_brightness_footer"
         android:title="@string/auto_brightness_description"
diff --git a/res/xml/dark_mode_settings.xml b/res/xml/dark_mode_settings.xml
index 5ac9e261b62..41946c1c141 100644
--- a/res/xml/dark_mode_settings.xml
+++ b/res/xml/dark_mode_settings.xml
@@ -20,6 +20,11 @@
     android:title="@string/dark_ui_mode"
     settings:keywords="@string/keywords_dark_ui_mode">
 
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="dark_ui_top_intro"
+        android:title="@string/dark_ui_text"
+        settings:searchable="false"/>
+
     <com.android.settingslib.widget.MainSwitchPreference
         android:key="dark_ui_activated"
         android:title="@string/dark_theme_main_switch_title"
@@ -30,11 +35,6 @@
         android:title="@string/twilight_mode_location_off_dialog_message"
         settings:controller="com.android.settings.display.TwilightLocationPreferenceController"/>
 
-    <com.android.settingslib.widget.TopIntroPreference
-        android:key="dark_ui_top_intro"
-        android:title="@string/dark_ui_text"
-        settings:searchable="false"/>
-
     <DropDownPreference
         android:key="dark_ui_auto_mode"
         android:title="@string/dark_ui_auto_mode_title"
diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index 23afccf48fe..95d503415f5 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -20,6 +20,11 @@
     android:title="@string/night_display_title"
     settings:keywords="@string/keywords_display_night_display">
 
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="night_display_top_intro"
+        android:title="@string/night_display_text"
+        settings:controller="com.android.settings.display.NightDisplayTopIntroPreferenceController"/>
+
     <com.android.settingslib.widget.MainSwitchPreference
         android:key="night_display_activated"
         android:title="@string/night_light_main_switch_title"
@@ -30,11 +35,6 @@
         android:title="@string/twilight_mode_location_off_dialog_message"
         settings:controller="com.android.settings.display.TwilightLocationPreferenceController"/>
 
-    <com.android.settingslib.widget.TopIntroPreference
-        android:key="night_display_top_intro"
-        android:title="@string/night_display_text"
-        settings:controller="com.android.settings.display.NightDisplayTopIntroPreferenceController"/>
-
     <DropDownPreference
         android:key="night_display_auto_mode"
         android:title="@string/night_display_auto_mode_title"