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

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

Merge "Apply top intro preference in Settings app (1/n)"

parents a40e0b86 00956fb4

res/xml/dark_mode_settings.xml

+5 −7
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 
        settings:allowDividerBelow="true"

        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"
@@ -55,11 +60,4 @@ 
        settings:allowDividerBelow="true"

        settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"/>



    <com.android.settingslib.widget.FooterPreference

            android:key="dark_ui_footer"

            android:title="@string/dark_ui_text"

            android:selectable="false"

            settings:searchable="false"

            settings:allowDividerAbove="true"/>



</PreferenceScreen>

res/xml/graphics_driver_settings.xml

+7 −9
Original line number Diff line number Diff line
@@ -20,12 +20,17 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/graphics_driver_dashboard_title">



    <com.android.settingslib.widget.TopIntroPreference

        android:key="top_info_graphics_driver"

        android:title="@string/graphics_driver_footer_text"

        settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverTopIntroPreferenceController"/>



    <ListPreference

        android:key="graphics_driver_all_apps_preference"

        android:title="@string/graphics_driver_all_apps_preference_title"

        android:dialogTitle="@string/graphics_driver_all_apps_preference_title"

        settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController">

    </ListPreference>

        settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController"

        settings:allowDividerAbove="true"/>



    <PreferenceCategory

        android:key="graphics_driver_category"
@@ -33,11 +38,4 @@ 
        settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverAppPreferenceController">

    </PreferenceCategory>



    <com.android.settingslib.widget.FooterPreference

        android:key="graphics_driver_footer"

        android:title="@string/graphics_driver_footer_text"

        android:selectable="false"

        settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverFooterPreferenceController">

    </com.android.settingslib.widget.FooterPreference>



</PreferenceScreen>

res/xml/night_display_settings.xml

+6 −7
Original line number Diff line number Diff line
@@ -27,10 +27,16 @@ 
        settings:controller="com.android.settings.display.TwilightLocationPreferenceController"

        settings:allowDividerBelow="true"/>



    <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"

        android:summary="%s"

        settings:allowDividerAbove="true"

        settings:controller="com.android.settings.display.NightDisplayAutoModePreferenceController"/>



    <Preference
@@ -59,11 +65,4 @@ 
        settings:keywords="@string/keywords_display_night_display"

        settings:controller="com.android.settings.display.NightDisplayActivationPreferenceController"/>



    <com.android.settingslib.widget.FooterPreference

        android:key="night_display_footer"

        android:title="@string/night_display_text"

        android:selectable="false"

        settings:allowDividerAbove="true"

        settings:controller="com.android.settings.display.NightDisplayFooterPreferenceController"/>



</PreferenceScreen>

res/xml/tether_prefs.xml

+6 −6
Original line number Diff line number Diff line
@@ -19,11 +19,16 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/tether_settings_title_all">



    <com.android.settingslib.widget.TopIntroPreference

        android:key="tether_prefs_top_intro"

        settings:searchable="false"/>



    <com.android.settings.widget.FixedLineSummaryPreference

        android:key="wifi_tether"

        android:title="@string/wifi_hotspot_checkbox_text"

        android:summary="@string/summary_placeholder"

        android:fragment="com.android.settings.wifi.tether.WifiTetherSettings"

        settings:allowDividerAbove="true"

        settings:summaryLineCount="2"/>



    <SwitchPreference
@@ -49,9 +54,4 @@ 
        android:summary="@string/tether_settings_disabled_on_data_saver"

        android:selectable="false"

        settings:allowDividerAbove="true" />



    <com.android.settingslib.widget.FooterPreference

        android:key="tether_prefs_footer"

        android:selectable="false"

        settings:searchable="false"/>

</PreferenceScreen>

res/xml/user_settings.xml

+5 −7
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ 
    android:key="user_settings_screen"

    android:title="@string/user_settings_title">



    <com.android.settingslib.widget.TopIntroPreference

        android:key="multiuser_top_intro"

        android:title="@string/user_settings_footer_text"

        settings:controller="com.android.settings.users.MultiUserTopIntroPreferenceController"/>



    <PreferenceCategory

        android:key="user_list"

        android:title="@string/user_list_title"
@@ -45,11 +50,4 @@ 
        android:order="105"

        settings:allowDividerAbove="true"/>



    <com.android.settingslib.widget.FooterPreference

        android:key="multiuser_footer"

        android:title="@string/user_settings_footer_text"

        android:selectable="false"

        settings:searchable="false"

        settings:controller="com.android.settings.users.MultiUserFooterPreferenceController"/>



</PreferenceScreen>