From aee0cb58e668dd9f64718b1c0d44a5ad6ff2a972 Mon Sep 17 00:00:00 2001
From: Tsung-Mao Fang <tmfang@google.com>
Date: Tue, 29 Dec 2020 17:32:01 +0800
Subject: [PATCH] Rearrange settings in Display page

Based on the Android S design,

- Group similar settings in a category.
- Set name for each category.
- Remove the "advanced" button design.
- Put settings into "Others" category" if settings are advanced/not
useful.

Test: Rebuilt rom and see the screen
Bug: 174964139
Change-Id: I80194aa8deb7a554188290935a8c790b410c6e1d
---
 res/values/strings.xml          |  11 ++
 res/xml/display_settings_v2.xml | 219 +++++++++++++++++---------------
 2 files changed, 129 insertions(+), 101 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b6693c0154e..fe15fdaea08 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12562,4 +12562,15 @@
     <string name="bluetooth_phonebook_access_dialog_title">Allow access to contacts and call log?</string>
     <!-- Bluetooth phonebook permission alert for dialog content [CHAR LIMIT=none] -->
     <string name="bluetooth_phonebook_access_dialog_content">An untrusted Bluetooth device, <xliff:g id="device_name" example="My device">%1$s</xliff:g>, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven\u2019t connected to <xliff:g id="device_name" example="My device">%2$s</xliff:g> before.</string>
+
+    <!-- Brightness category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_brightness">Brightness</string>
+    <!-- Lock screen category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_lock_display">Lock Display</string>
+    <!-- Visibility category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_visibility">Visibility</string>
+    <!-- Color category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_color">Color</string>
+    <!-- Others category name [CHAR LIMIT=none] -->
+    <string name="category_name_others">Others</string>
 </resources>
diff --git a/res/xml/display_settings_v2.xml b/res/xml/display_settings_v2.xml
index aefd2ecbcf8..4edc335d434 100644
--- a/res/xml/display_settings_v2.xml
+++ b/res/xml/display_settings_v2.xml
@@ -19,125 +19,142 @@
     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:initialExpandedChildrenCount="5">
+    settings:keywords="@string/keywords_display">
 
-    <com.android.settingslib.RestrictedPreference
-        android:key="brightness"
-        android:title="@string/brightness"
-        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" />
-    </com.android.settingslib.RestrictedPreference>
+    <PreferenceCategory
+        android:title="@string/category_name_brightness">
 
-    <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:keywords="@string/keywords_dark_ui_mode"/>
+        <com.android.settingslib.RestrictedPreference
+            android:key="brightness"
+            android:title="@string/brightness"
+            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"/>
+        </com.android.settingslib.RestrictedPreference>
 
-    <com.android.settings.widget.PrimarySwitchPreference
-        android:key="night_display"
-        android:title="@string/night_display_title"
-        android:fragment="com.android.settings.display.NightDisplaySettings"
-        settings:controller="com.android.settings.display.NightDisplayPreferenceController"
-        settings:keywords="@string/keywords_display_night_display"/>
+        <Preference
+            android:key="auto_brightness_entry"
+            android:title="@string/auto_brightness_title"
+            android:summary="@string/summary_placeholder"
+            android:fragment="com.android.settings.display.AutoBrightnessSettings"
+            settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
+    </PreferenceCategory>
 
-    <Preference
-        android:key="auto_brightness_entry"
-        android:title="@string/auto_brightness_title"
-        android:summary="@string/summary_placeholder"
-        android:fragment="com.android.settings.display.AutoBrightnessSettings"
-        settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
+    <PreferenceCategory
+        android:title="@string/category_name_lock_display">
 
-    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
-    <com.android.settingslib.RestrictedPreference
-        android:key="screen_timeout"
-        android:title="@string/screen_timeout"
-        android:summary="@string/summary_placeholder"
-        android:fragment="com.android.settings.display.ScreenTimeoutSettings"
-        settings:controller="com.android.settings.display.ScreenTimeoutPreferenceController" />
+        <Preference
+            android:key="lockscreen_from_display_settings"
+            android:title="@string/lockscreen_settings_title"
+            android:fragment="com.android.settings.security.LockscreenDashboardFragment"
+            settings:keywords="@string/keywords_ambient_display_screen"
+            settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"/>
 
-    <SwitchPreference
-        android:key="auto_rotate"
-        android:title="@string/accelerometer_title"
-        settings:keywords="@string/keywords_auto_rotate"
-        settings:controller="com.android.settings.display.AutoRotatePreferenceController" />
+        <com.android.settingslib.RestrictedPreference
+            android:key="screen_timeout"
+            android:title="@string/screen_timeout"
+            android:summary="@string/summary_placeholder"
+            android:fragment="com.android.settings.display.ScreenTimeoutSettings"
+            settings:controller="com.android.settings.display.ScreenTimeoutPreferenceController"/>
+    </PreferenceCategory>
 
-    <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" />
+    <PreferenceCategory
+        android:title="@string/category_name_visibility">
 
-    <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" />
+        <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:keywords="@string/keywords_dark_ui_mode"/>
 
-    <SwitchPreference
-        android:key="peak_refresh_rate"
-        android:title="@string/peak_refresh_rate_title"
-        android:summary="@string/peak_refresh_rate_summary"
-        settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController" />
+        <Preference
+            android:key="font_size"
+            android:title="@string/title_font_size"
+            android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
+            settings:controller="com.android.settings.display.FontSizePreferenceController"
+            settings:keywords="@string/keywords_font_size"/>
 
-    <Preference
-        android:key="font_size"
-        android:title="@string/title_font_size"
-        android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
-        settings:controller="com.android.settings.display.FontSizePreferenceController"
-        settings:keywords="@string/keywords_font_size" />
+        <com.android.settings.display.ScreenZoomPreference
+            android:key="display_settings_screen_zoom"
+            android:title="@string/screen_zoom_title"
+            android:fragment="com.android.settings.display.ScreenZoomSettings"/>
+    </PreferenceCategory>
 
-    <com.android.settings.display.ScreenZoomPreference
-        android:key="display_settings_screen_zoom"
-        android:title="@string/screen_zoom_title"
-        android:fragment="com.android.settings.display.ScreenZoomSettings"/>
+    <PreferenceCategory
+        android:title="@string/category_name_color">
 
-    <SwitchPreference
-        android:key="show_operator_name"
-        android:title="@string/show_operator_name_title"
-        android:summary="@string/show_operator_name_summary" />
+        <com.android.settings.widget.PrimarySwitchPreference
+            android:key="night_display"
+            android:title="@string/night_display_title"
+            android:fragment="com.android.settings.display.NightDisplaySettings"
+            settings:controller="com.android.settings.display.NightDisplayPreferenceController"
+            settings:keywords="@string/keywords_display_night_display"/>
 
-    <Preference
-        android:key="screensaver"
-        android:title="@string/screensaver_settings_title"
-        android:fragment="com.android.settings.dream.DreamSettings" />
+        <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"/>
+    </PreferenceCategory>
 
-    <Preference
-        android:key="lockscreen_from_display_settings"
-        android:title="@string/lockscreen_settings_title"
-        android:fragment="com.android.settings.security.LockscreenDashboardFragment"
-        settings:keywords="@string/keywords_ambient_display_screen"
-        settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController" />
+    <PreferenceCategory
+        android:title="@string/category_name_others">
 
-    <SwitchPreference
-        android:key="camera_gesture"
-        android:title="@string/camera_gesture_title"
-        android:summary="@string/camera_gesture_desc" />
+        <SwitchPreference
+            android:key="auto_rotate"
+            android:title="@string/accelerometer_title"
+            settings:keywords="@string/keywords_auto_rotate"
+            settings:controller="com.android.settings.display.AutoRotatePreferenceController"/>
 
-    <SwitchPreference
-        android:key="lift_to_wake"
-        android:title="@string/lift_to_wake_title" />
+        <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"/>
 
-    <SwitchPreference
-        android:key="tap_to_wake"
-        android:title="@string/tap_to_wake"
-        android:summary="@string/tap_to_wake_summary" />
+        <SwitchPreference
+            android:key="peak_refresh_rate"
+            android:title="@string/peak_refresh_rate_title"
+            android:summary="@string/peak_refresh_rate_summary"
+            settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController"/>
 
-    <ListPreference
-        android:key="theme"
-        android:title="@string/device_theme"
-        android:summary="@string/summary_placeholder" />
+        <SwitchPreference
+            android:key="show_operator_name"
+            android:title="@string/show_operator_name_title"
+            android:summary="@string/show_operator_name_summary"/>
 
-    <Preference
-        android:key="vr_display_pref"
-        android:title="@string/display_vr_pref_title"
-        android:fragment="com.android.settings.display.VrDisplayPreferencePicker" />
+        <Preference
+            android:key="screensaver"
+            android:title="@string/screensaver_settings_title"
+            android:fragment="com.android.settings.dream.DreamSettings"/>
 
+        <SwitchPreference
+            android:key="camera_gesture"
+            android:title="@string/camera_gesture_title"
+            android:summary="@string/camera_gesture_desc"/>
+
+        <SwitchPreference
+            android:key="lift_to_wake"
+            android:title="@string/lift_to_wake_title"/>
+
+        <SwitchPreference
+            android:key="tap_to_wake"
+            android:title="@string/tap_to_wake"
+            android:summary="@string/tap_to_wake_summary"/>
+
+        <ListPreference
+            android:key="theme"
+            android:title="@string/device_theme"
+            android:summary="@string/summary_placeholder"/>
+
+        <Preference
+            android:key="vr_display_pref"
+            android:title="@string/display_vr_pref_title"
+            android:fragment="com.android.settings.display.VrDisplayPreferencePicker"/>
+    </PreferenceCategory>
 </PreferenceScreen>