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

Commit 703011df authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix homepage untitled preference category padding" into main

parents a8a0376f 586258f0

res/xml/top_level_settings_expressive.xml

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

    android:key="top_level_settings">



    <PreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

        android:order="-140"

        android:key="top_level_account_category"

        android:layout="@layout/settingslib_untitled_preference_category">

    </PreferenceCategory>

        android:key="top_level_account_category"/>



    <PreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

        android:order="-130"

        android:key="top_level_connectivity_category"

        android:layout="@layout/settingslib_expressive_untitled_preference_category">

        android:key="top_level_connectivity_category">

        <com.android.settings.widget.HomepagePreference

            android:fragment="com.android.settings.network.NetworkDashboardFragment"

            android:icon="@drawable/ic_homepage_network"
@@ -49,12 +46,11 @@ 
            android:summary="@string/connected_devices_dashboard_default_summary"

            settings:highlightableMenuKey="@string/menu_key_connected_devices"

            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>

    </PreferenceCategory>

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



    <PreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

        android:order="-120"

        android:key="top_level_personalize_category"

        android:layout="@layout/settingslib_expressive_untitled_preference_category">

        android:key="top_level_personalize_category">

        <com.android.settings.widget.HomepagePreference

            android:fragment="com.android.settings.applications.AppDashboardFragment"

            android:icon="@drawable/ic_homepage_apps"
@@ -120,9 +116,9 @@ 
            android:summary="@string/wallpaper_dashboard_summary"

            settings:highlightableMenuKey="@string/menu_key_wallpaper"

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

    </PreferenceCategory>

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



    <PreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

        android:order="-110"

        android:key="top_level_system_info_category"

        android:layout="@layout/settingslib_expressive_untitled_preference_category">
@@ -164,9 +160,9 @@ 
            android:summary="@string/summary_placeholder"

            settings:highlightableMenuKey="@string/menu_key_about_device"

            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>

    </PreferenceCategory>

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



    <PreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

        android:order="-100"

        android:key="top_level_security_privacy_category"

        android:layout="@layout/settingslib_expressive_untitled_preference_category">
@@ -237,9 +233,9 @@ 
            android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"

            settings:isPreferenceVisible="@bool/config_show_emergency_settings"

            settings:highlightableMenuKey="@string/menu_key_emergency"/>

    </PreferenceCategory>

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



    <PreferenceCategory

    <com.android.settingslib.widget.UntitledPreferenceCategory

        android:order="100"

        android:key="top_level_support_category"

        android:layout="@layout/settingslib_expressive_untitled_preference_category">
@@ -262,6 +258,6 @@ 
            android:summary="@string/support_summary"

            settings:highlightableMenuKey="@string/menu_key_support"

            settings:controller="com.android.settings.support.SupportPreferenceController"/>

    </PreferenceCategory>



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

</PreferenceScreen>