Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42af840f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 302fb361 71ca31cb

res/xml/auto_brightness_detail.xml

+6 −6
Original line number Diff line number Diff line
@@ -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"

res/xml/dark_mode_settings.xml

+5 −5
Original line number Diff line number Diff line
@@ -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"

res/xml/night_display_settings.xml

+5 −5
Original line number Diff line number Diff line
@@ -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"