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

Merge "Adjust layout of Display Settings" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-31 03:00:19 +00:00
committed by Android (Google) Code Review
parent 302fb36121 71ca31cbac
commit 42af840f68
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/xml/auto_brightness_detail.xml
View File

@@ -20,12 +20,6 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/auto_brightness_title"> 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 <com.android.settings.widget.VideoPreference
android:key="auto_brightness_video" android:key="auto_brightness_video"
android:title="@string/summary_placeholder" android:title="@string/summary_placeholder"
@@ -33,6 +27,12 @@
settings:preview="@drawable/aab_brightness" settings:preview="@drawable/aab_brightness"
settings:controller="com.android.settings.widget.VideoPreferenceController"/> 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 <com.android.settingslib.widget.FooterPreference
android:key="auto_brightness_footer" android:key="auto_brightness_footer"
android:title="@string/auto_brightness_description" android:title="@string/auto_brightness_description"

10
res/xml/dark_mode_settings.xml
View File

@@ -20,6 +20,11 @@
android:title="@string/dark_ui_mode" android:title="@string/dark_ui_mode"
settings:keywords="@string/keywords_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 <com.android.settingslib.widget.MainSwitchPreference
android:key="dark_ui_activated" android:key="dark_ui_activated"
android:title="@string/dark_theme_main_switch_title" android:title="@string/dark_theme_main_switch_title"
@@ -30,11 +35,6 @@
android:title="@string/twilight_mode_location_off_dialog_message" android:title="@string/twilight_mode_location_off_dialog_message"
settings:controller="com.android.settings.display.TwilightLocationPreferenceController"/> 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 <DropDownPreference
android:key="dark_ui_auto_mode" android:key="dark_ui_auto_mode"
android:title="@string/dark_ui_auto_mode_title" android:title="@string/dark_ui_auto_mode_title"

10
res/xml/night_display_settings.xml
View File

@@ -20,6 +20,11 @@
android:title="@string/night_display_title" android:title="@string/night_display_title"
settings:keywords="@string/keywords_display_night_display"> 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 <com.android.settingslib.widget.MainSwitchPreference
android:key="night_display_activated" android:key="night_display_activated"
android:title="@string/night_light_main_switch_title" android:title="@string/night_light_main_switch_title"
@@ -30,11 +35,6 @@
android:title="@string/twilight_mode_location_off_dialog_message" android:title="@string/twilight_mode_location_off_dialog_message"
settings:controller="com.android.settings.display.TwilightLocationPreferenceController"/> 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 <DropDownPreference
android:key="night_display_auto_mode" android:key="night_display_auto_mode"
android:title="@string/night_display_auto_mode_title" android:title="@string/night_display_auto_mode_title"