From 979ae03128e60290428f5dcf0fe544ad3e022b71 Mon Sep 17 00:00:00 2001
From: fauyds <80756182+fauyds@users.noreply.github.com>
Date: Sat, 29 Nov 2025 13:44:38 -0800
Subject: [PATCH] Top Level Settings

Added card to extras settings
Centered settings icons
---
 res/layout/preference_category_no_label.xml   |   2 +-
 res/values/dimens.xml                         |   2 +-
 res/xml/top_level_settings.xml                | 249 ++++++--------
 res/xml/top_level_settings_expressive.xml     | 287 +++++++---------
 .../top_level_settings_expressive_rising.xml  | 272 +++++++--------
 res/xml/top_level_settings_simple.xml         | 322 +++++++-----------
 res/xml/top_level_settings_v2.xml             | 316 +++++++----------
 7 files changed, 609 insertions(+), 841 deletions(-)

diff --git a/res/layout/preference_category_no_label.xml b/res/layout/preference_category_no_label.xml
index dafabb23124..396be96b229 100644
--- a/res/layout/preference_category_no_label.xml
+++ b/res/layout/preference_category_no_label.xml
@@ -16,5 +16,5 @@
 -->
 <Space xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="0dp" />
+    android:layout_height="8dp" />
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8d5ece715bc..a0f0b46e779 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -70,7 +70,7 @@
     <dimen name="dashboard_tile_foreground_image_size">24dp</dimen>
 
     <!-- Dashboard foreground image inset (from background edge to foreground edge) -->
-    <dimen name="dashboard_tile_foreground_image_inset">8dp</dimen>
+    <dimen name="dashboard_tile_foreground_image_inset">9dp</dimen>
 
     <!-- Preference icon foreground image inset (from background edge to foreground edge) -->
     <dimen name="preference_icon_foreground_image_inset">12dp</dimen>
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index a6c3f64e3f8..e70aeec7955 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -1,236 +1,197 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
 <PreferenceScreen
+    android:key="top_level_settings"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="top_level_settings">
-    
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
     <Preference
-        android:fragment="com.rising.settings.PersonalizationsFragment"
         android:icon="@drawable/ic_settings_cogs"
-        android:key="top_level_personalizations"
-        android:order="9"
         android:title="@string/rising_settings_title"
+        android:key="top_level_personalizations"
         android:summary="@string/rising_settings_summary"
-        settings:controller="com.rising.settings.TopLevelSettingsPreferenceController"/>
-
+        android:order="9"
+        android:fragment="com.rising.settings.PersonalizationsFragment"
+        settings:controller="com.rising.settings.TopLevelSettingsPreferenceController" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.network.NetworkDashboardFragment"
         android:icon="@drawable/ic_settings_wireless"
-        android:key="top_level_network"
-        android:order="-150"
         android:title="@string/network_dashboard_title"
+        android:key="top_level_network"
         android:summary="@string/summary_placeholder"
-        settings:highlightableMenuKey="@string/menu_key_network"
-        settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
-
+        android:order="-150"
+        android:fragment="com.android.settings.network.NetworkDashboardFragment"
+        settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_network" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.communal.CommunalDashboardFragment"
         android:icon="@drawable/ia_settings_communal"
-        android:key="top_level_communal"
-        android:order="-145"
         android:title="@string/communal_settings_title"
+        android:key="top_level_communal"
         android:summary="@string/communal_settings_summary"
-        settings:highlightableMenuKey="@string/menu_key_communal"
-        settings:controller="com.android.settings.communal.CommunalPreferenceController"/>
-
+        android:order="-145"
+        android:fragment="com.android.settings.communal.CommunalDashboardFragment"
+        settings:controller="com.android.settings.communal.CommunalPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_communal" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
         android:icon="@drawable/ic_devices_other"
-        android:key="top_level_connected_devices"
-        android:order="-140"
         android:title="@string/connected_devices_dashboard_title"
+        android:key="top_level_connected_devices"
         android:summary="@string/connected_devices_dashboard_default_summary"
-        settings:highlightableMenuKey="@string/menu_key_connected_devices"
-        settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
-
+        android:order="-140"
+        android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
+        settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_connected_devices" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.applications.AppDashboardFragment"
         android:icon="@drawable/ic_apps"
-        android:key="top_level_apps"
-        android:order="-130"
         android:title="@string/apps_dashboard_title"
+        android:key="top_level_apps"
         android:summary="@string/app_and_notification_dashboard_summary"
-        settings:highlightableMenuKey="@string/menu_key_apps"/>
-
+        android:order="-130"
+        android:fragment="com.android.settings.applications.AppDashboardFragment"
+        settings:highlightableMenuKey="@string/menu_key_apps" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
         android:icon="@drawable/ic_notifications"
-        android:key="top_level_notifications"
-        android:order="-120"
         android:title="@string/configure_notification_settings"
+        android:key="top_level_notifications"
         android:summary="@string/notification_dashboard_summary"
-        settings:highlightableMenuKey="@string/menu_key_notifications"/>
-
+        android:order="-120"
+        android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
+        settings:highlightableMenuKey="@string/menu_key_notifications" />
     <com.android.settings.widget.RestrictedHomepagePreference
-        android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
-        android:icon="@*android:drawable/ic_zen_priority_modes"
+        android:icon="@android:drawable/item_background_material_dark"
+        android:title="@string/zen_modes_list_title"
         android:key="top_level_priority_modes"
         android:order="-115"
-        android:title="@string/zen_modes_list_title"
-        settings:useAdminDisabledSummary="true"
+        android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
+        settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"
         settings:highlightableMenuKey="@string/menu_key_priority_modes"
-        settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"/>
-
+        settings:useAdminDisabledSummary="true" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageSummary"
         android:icon="@drawable/ic_settings_battery_white"
-        android:key="top_level_battery"
-        android:order="-110"
         android:title="@string/power_usage_summary_title"
+        android:key="top_level_battery"
         android:summary="@string/summary_placeholder"
-        settings:highlightableMenuKey="@string/menu_key_battery"
-        settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
-
+        android:order="-110"
+        android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageSummary"
+        settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_battery" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
         android:icon="@drawable/ic_storage_white"
-        android:key="top_level_storage"
-        android:order="-100"
         android:title="@string/storage_settings"
+        android:key="top_level_storage"
         android:summary="@string/summary_placeholder"
-        settings:highlightableMenuKey="@string/menu_key_storage"
-        settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
-
+        android:order="-100"
+        android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
+        settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_storage" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.notification.SoundSettings"
         android:icon="@drawable/ic_volume_up_24dp"
-        android:key="top_level_sound"
-        android:order="-90"
         android:title="@string/sound_settings"
+        android:key="top_level_sound"
         android:summary="@string/sound_dashboard_summary_with_dnd"
-        settings:highlightableMenuKey="@string/menu_key_sound"
-        settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>
-
+        android:order="-90"
+        android:fragment="com.android.settings.notification.SoundSettings"
+        settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_sound" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.DisplaySettings"
         android:icon="@drawable/ic_settings_display_white"
-        android:key="top_level_display"
-        android:order="-80"
         android:title="@string/display_settings"
+        android:key="top_level_display"
         android:summary="@string/display_dashboard_summary"
-        settings:highlightableMenuKey="@string/menu_key_display"
-        settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
-
+        android:order="-80"
+        android:fragment="com.android.settings.DisplaySettings"
+        settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_display" />
     <com.android.settings.widget.RestrictedHomepagePreference
         android:icon="@drawable/ic_settings_wallpaper_white"
-        android:key="top_level_wallpaper"
-        android:order="-70"
         android:title="@string/wallpaper_settings_title"
+        android:key="top_level_wallpaper"
         android:summary="@string/wallpaper_dashboard_summary"
-        settings:highlightableMenuKey="@string/menu_key_wallpaper"
-        settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
-
+        android:order="-70"
+        settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_wallpaper" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.accessibility.AccessibilitySettings"
         android:icon="@drawable/ic_settings_accessibility"
-        android:key="top_level_accessibility"
-        android:order="-60"
         android:title="@string/accessibility_settings"
+        android:key="top_level_accessibility"
         android:summary="@string/accessibility_settings_summary"
-        settings:highlightableMenuKey="@string/menu_key_accessibility"
-        settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
-
+        android:order="-60"
+        android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+        settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_accessibility" />
     <com.android.settings.widget.HomepagePreference
         android:icon="@drawable/ic_settings_safety_center"
-        android:key="top_level_safety_center"
-        android:order="-55"
         android:title="@string/safety_center_title"
+        android:key="top_level_safety_center"
         android:summary="@string/safety_center_summary"
-        settings:highlightableMenuKey="@string/menu_key_safety_center"
-        settings:controller="com.android.settings.safetycenter.TopLevelSafetyCenterEntryPreferenceController"/>
-
+        android:order="-55"
+        settings:controller="com.android.settings.safetycenter.TopLevelSafetyCenterEntryPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_safety_center" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.security.SecuritySettings"
         android:icon="@drawable/ic_settings_security_white"
-        android:key="top_level_security"
-        android:order="-50"
         android:title="@string/security_settings_title"
+        android:key="top_level_security"
         android:summary="@string/security_dashboard_summary"
-        settings:highlightableMenuKey="@string/menu_key_security"
-        settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
-
+        android:order="-50"
+        android:fragment="com.android.settings.security.SecuritySettings"
+        settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_security" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
         android:icon="@drawable/ic_settings_privacy"
-        android:key="top_level_privacy"
-        android:order="-40"
         android:title="@string/privacy_dashboard_title"
+        android:key="top_level_privacy"
         android:summary="@string/privacy_dashboard_summary"
-        settings:highlightableMenuKey="@string/menu_key_privacy"
-        settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"/>
-
+        android:order="-40"
+        android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
+        settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_privacy" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.location.LocationSettings"
         android:icon="@drawable/ic_settings_location"
-        android:key="top_level_location"
-        android:order="-30"
         android:title="@string/location_settings_title"
+        android:key="top_level_location"
         android:summary="@string/location_settings_loading_app_permission_stats"
-        settings:highlightableMenuKey="@string/menu_key_location"
-        settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
-
+        android:order="-30"
+        android:fragment="com.android.settings.location.LocationSettings"
+        settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_location" />
     <com.android.settings.widget.HomepagePreference
-        android:key="top_level_emergency"
+        android:icon="@drawable/ic_settings_emergency"
         android:title="@string/emergency_settings_preference_title"
+        android:key="top_level_emergency"
         android:summary="@string/emergency_dashboard_summary"
-        android:icon="@drawable/ic_settings_emergency"
         android:order="-20"
         android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"
-        settings:isPreferenceVisible="@bool/config_show_emergency_settings"
-        settings:highlightableMenuKey="@string/menu_key_emergency"/>
-
+        settings:highlightableMenuKey="@string/menu_key_emergency"
+        settings:isPreferenceVisible="@bool/config_show_emergency_settings" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.accounts.AccountDashboardFragment"
         android:icon="@drawable/ic_settings_accounts"
-        android:key="top_level_accounts"
-        android:order="-10"
         android:title="@string/account_dashboard_title_with_passkeys"
+        android:key="top_level_accounts"
         android:summary="@string/summary_placeholder"
-        settings:highlightableMenuKey="@string/menu_key_accounts"
-        settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
-
+        android:order="-10"
+        android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+        settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_accounts" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.system.SystemDashboardFragment"
         android:icon="@drawable/ic_settings_system_dashboard_white"
-        android:key="top_level_system"
-        android:order="10"
         android:title="@string/header_category_system"
+        android:key="top_level_system"
         android:summary="@string/system_dashboard_summary"
-        settings:highlightableMenuKey="@string/menu_key_system"/>
-
+        android:order="10"
+        android:fragment="com.android.settings.system.SystemDashboardFragment"
+        settings:highlightableMenuKey="@string/menu_key_system" />
     <com.android.settings.widget.HomepagePreference
-        android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
         android:icon="@drawable/ic_settings_about_device"
-        android:key="top_level_about_device"
-        android:order="20"
         android:title="@string/about_settings"
+        android:key="top_level_about_device"
         android:summary="@string/summary_placeholder"
-        settings:highlightableMenuKey="@string/menu_key_about_device"
-        settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
-
+        android:order="20"
+        android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
+        settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_about_device" />
     <com.android.settings.widget.HomepagePreference
         android:icon="@drawable/ic_help"
-        android:key="top_level_support"
-        android:order="100"
         android:title="@string/page_tab_title_support"
+        android:key="top_level_support"
         android:summary="@string/support_summary"
-        settings:highlightableMenuKey="@string/menu_key_support"
-        settings:controller="com.android.settings.support.SupportPreferenceController"/>
-
-</PreferenceScreen>
+        android:order="100"
+        settings:controller="com.android.settings.support.SupportPreferenceController"
+        settings:highlightableMenuKey="@string/menu_key_support" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/top_level_settings_expressive.xml b/res/xml/top_level_settings_expressive.xml
index 63b9be8731f..fc834cdda0d 100644
--- a/res/xml/top_level_settings_expressive.xml
+++ b/res/xml/top_level_settings_expressive.xml
@@ -1,278 +1,239 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2025 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
 <PreferenceScreen
+    android:key="top_level_settings"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="top_level_settings">
-
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
+    <com.android.settings.preferences.AutoHidePreferenceCategory
+        android:layout="@layout/preference_category"
+        android:key="top_level_extras_category"
+        android:order="-1001" />
     <PreferenceCategory
-        android:order="-140"
+        android:layout="@layout/preference_category"
         android:key="top_level_account_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-    </PreferenceCategory>
-
+        android:order="-140" />
     <PreferenceCategory
-        android:order="-130"
+        android:layout="@layout/preference_category"
         android:key="top_level_connectivity_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
+        android:order="-130">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.network.NetworkDashboardFragment"
             android:icon="@drawable/ic_homepage_network"
-            android:key="top_level_network"
-            android:order="-20"
             android:title="@string/network_dashboard_title"
+            android:key="top_level_network"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_network"
-            settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.network.NetworkDashboardFragment"
+            settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_network" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
             android:icon="@drawable/ic_homepage_connected_device"
-            android:key="top_level_connected_devices"
-            android:order="-10"
             android:title="@string/connected_devices_dashboard_title"
+            android:key="top_level_connected_devices"
             android:summary="@string/connected_devices_dashboard_default_summary"
-            settings:highlightableMenuKey="@string/menu_key_connected_devices"
-            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
+            android:order="-10"
+            android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
+            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_connected_devices" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-120"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_personalize_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
+        android:order="-120">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.rising.settings.PersonalizationsFragment"
             android:icon="@drawable/ic_homepage_personalization"
-            android:key="top_level_personalizations"
-            android:order="-61"
             android:title="@string/rising_settings_title"
+            android:key="top_level_personalizations"
             android:summary="@string/rising_settings_summary"
-            settings:controller="com.rising.settings.TopLevelSettingsPreferenceController"/>
-
+            android:order="-61"
+            android:fragment="com.rising.settings.PersonalizationsFragment"
+            settings:controller="com.rising.settings.TopLevelSettingsPreferenceController" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.applications.AppDashboardFragment"
             android:icon="@drawable/ic_homepage_apps"
-            android:key="top_level_apps"
-            android:order="-60"
             android:title="@string/apps_dashboard_title"
+            android:key="top_level_apps"
             android:summary="@string/app_and_notification_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_apps"/>
-
+            android:order="-60"
+            android:fragment="com.android.settings.applications.AppDashboardFragment"
+            settings:highlightableMenuKey="@string/menu_key_apps" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
             android:icon="@drawable/ic_homepage_notification"
-            android:key="top_level_notifications"
-            android:order="-50"
             android:title="@string/configure_notification_settings"
+            android:key="top_level_notifications"
             android:summary="@string/notification_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_notifications"/>
-
+            android:order="-50"
+            android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
+            settings:highlightableMenuKey="@string/menu_key_notifications" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.notification.SoundSettings"
             android:icon="@drawable/ic_homepage_sound"
-            android:key="top_level_sound"
-            android:order="-40"
             android:title="@string/sound_settings"
+            android:key="top_level_sound"
             android:summary="@string/sound_dashboard_summary_with_dnd"
-            settings:highlightableMenuKey="@string/menu_key_sound"
-            settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>
-
+            android:order="-40"
+            android:fragment="com.android.settings.notification.SoundSettings"
+            settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_sound" />
         <com.android.settings.widget.RestrictedHomepagePreference
-            android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
             android:icon="@drawable/ic_homepage_modes"
+            android:title="@string/zen_modes_list_title"
             android:key="top_level_priority_modes"
             android:order="-35"
-            android:title="@string/zen_modes_list_title"
-            settings:useAdminDisabledSummary="true"
+            android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
+            settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"
             settings:highlightableMenuKey="@string/menu_key_priority_modes"
-            settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"/>
-
+            settings:useAdminDisabledSummary="true" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.communal.CommunalDashboardFragment"
             android:icon="@drawable/ic_homepage_hub_mode"
-            android:key="top_level_communal"
-            android:order="-30"
             android:title="@string/communal_settings_title"
+            android:key="top_level_communal"
             android:summary="@string/communal_settings_summary"
-            settings:highlightableMenuKey="@string/menu_key_communal"
-            settings:controller="com.android.settings.communal.CommunalPreferenceController"/>
-
+            android:order="-30"
+            android:fragment="com.android.settings.communal.CommunalDashboardFragment"
+            settings:controller="com.android.settings.communal.CommunalPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_communal" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.DisplaySettings"
             android:icon="@drawable/ic_homepage_display"
-            android:key="top_level_display"
-            android:order="-20"
             android:title="@string/display_settings"
+            android:key="top_level_display"
             android:summary="@string/display_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_display"
-            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.DisplaySettings"
+            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_display" />
         <com.android.settings.widget.RestrictedHomepagePreference
             android:icon="@drawable/ic_homepage_wallpaper"
-            android:key="top_level_wallpaper"
-            android:order="-10"
             android:title="@string/wallpaper_settings_title"
+            android:key="top_level_wallpaper"
             android:summary="@string/wallpaper_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_wallpaper"
-            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
+            android:order="-10"
+            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_wallpaper" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-110"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_system_info_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
+        android:order="-110">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
             android:icon="@drawable/ic_homepage_storage"
-            android:key="top_level_storage"
-            android:order="-50"
             android:title="@string/storage_settings"
+            android:key="top_level_storage"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_storage"
-            settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
-
+            android:order="-50"
+            android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
+            settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_storage" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageSummary"
             android:icon="@drawable/ic_homepage_battery"
-            android:key="top_level_battery"
-            android:order="-30"
             android:title="@string/power_usage_summary_title"
+            android:key="top_level_battery"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_battery"
-            settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
-
+            android:order="-30"
+            android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageSummary"
+            settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_battery" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.system.SystemDashboardFragment"
             android:icon="@drawable/ic_homepage_system_dashboard"
-            android:key="top_level_system"
-            android:order="-20"
             android:title="@string/header_category_system"
+            android:key="top_level_system"
             android:summary="@string/system_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_system"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.system.SystemDashboardFragment"
+            settings:highlightableMenuKey="@string/menu_key_system" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
             android:icon="@drawable/ic_homepage_about"
-            android:key="top_level_about_device"
-            android:order="-10"
             android:title="@string/about_settings"
+            android:key="top_level_about_device"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_about_device"
-            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
+            android:order="-10"
+            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
+            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_about_device" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-100"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_security_privacy_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
+        android:order="-100">
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_homepage_safety_center"
-            android:key="top_level_safety_center"
-            android:order="-50"
             android:title="@string/safety_center_title"
+            android:key="top_level_safety_center"
             android:summary="@string/safety_center_summary"
-            settings:highlightableMenuKey="@string/menu_key_safety_center"
-            settings:controller="com.android.settings.safetycenter.TopLevelSafetyCenterEntryPreferenceController"/>
-
+            android:order="-50"
+            settings:controller="com.android.settings.safetycenter.TopLevelSafetyCenterEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_safety_center" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.security.SecuritySettings"
             android:icon="@drawable/ic_homepage_security"
-            android:key="top_level_security"
-            android:order="-40"
             android:title="@string/security_settings_title"
+            android:key="top_level_security"
             android:summary="@string/security_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_security"
-            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
-
+            android:order="-40"
+            android:fragment="com.android.settings.security.SecuritySettings"
+            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_security" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
             android:icon="@drawable/ic_homepage_privacy"
-            android:key="top_level_privacy"
-            android:order="-30"
             android:title="@string/privacy_dashboard_title"
+            android:key="top_level_privacy"
             android:summary="@string/privacy_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_privacy"
-            settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"/>
-
+            android:order="-30"
+            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
+            settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_privacy" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.location.LocationSettings"
             android:icon="@drawable/ic_homepage_location"
-            android:key="top_level_location"
-            android:order="-20"
             android:title="@string/location_settings_title"
+            android:key="top_level_location"
             android:summary="@string/location_settings_loading_app_permission_stats"
-            settings:highlightableMenuKey="@string/menu_key_location"
-            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.location.LocationSettings"
+            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_location" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
             android:icon="@drawable/ic_homepage_accounts"
-            android:key="top_level_accounts"
-            android:order="-10"
             android:title="@string/account_dashboard_title_with_passkeys"
+            android:key="top_level_accounts"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_accounts"
-            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
-
+            android:order="-10"
+            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_accounts" />
         <com.android.settings.widget.HomepagePreference
-            android:key="top_level_supervision"
+            android:icon="@drawable/ic_homepage_supervision"
             android:title="@string/supervision_settings_title"
+            android:key="top_level_supervision"
             android:summary="@string/supervision_settings_summary"
-            android:icon="@drawable/ic_homepage_supervision"
             android:order="5"
             android:fragment="com.android.settings.supervision.SupervisionDashboardFragment"
-            settings:highlightableMenuKey="@string/menu_key_supervision"
-            settings:controller="com.android.settings.supervision.TopLevelSupervisionPreferenceController"/>
-
+            settings:controller="com.android.settings.supervision.TopLevelSupervisionPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_supervision" />
         <com.android.settings.widget.HomepagePreference
-            android:key="top_level_emergency"
+            android:icon="@drawable/ic_homepage_emergency"
             android:title="@string/emergency_settings_preference_title"
+            android:key="top_level_emergency"
             android:summary="@string/emergency_dashboard_summary"
-            android:icon="@drawable/ic_homepage_emergency"
             android:order="10"
             android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"
-            settings:isPreferenceVisible="@bool/config_show_emergency_settings"
-            settings:highlightableMenuKey="@string/menu_key_emergency"/>
+            settings:highlightableMenuKey="@string/menu_key_emergency"
+            settings:isPreferenceVisible="@bool/config_show_emergency_settings" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="100"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_support_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-
+        android:order="100">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
             android:icon="@drawable/ic_homepage_accessibility"
-            android:key="top_level_accessibility"
-            android:order="-20"
             android:title="@string/accessibility_settings"
+            android:key="top_level_accessibility"
             android:summary="@string/accessibility_settings_summary"
-            settings:highlightableMenuKey="@string/menu_key_accessibility"
-            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_accessibility" />
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_homepage_support"
-            android:key="top_level_support"
-            android:order="-10"
             android:title="@string/page_tab_title_support"
+            android:key="top_level_support"
             android:summary="@string/support_summary"
-            settings:highlightableMenuKey="@string/menu_key_support"
-            settings:controller="com.android.settings.support.SupportPreferenceController"/>
+            android:order="-10"
+            settings:controller="com.android.settings.support.SupportPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_support" />
     </PreferenceCategory>
-
-</PreferenceScreen>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/top_level_settings_expressive_rising.xml b/res/xml/top_level_settings_expressive_rising.xml
index 0b4c69c9b5c..39c3e3931a4 100644
--- a/res/xml/top_level_settings_expressive_rising.xml
+++ b/res/xml/top_level_settings_expressive_rising.xml
@@ -1,264 +1,226 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2025 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
 <PreferenceScreen
+    android:key="top_level_settings"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="top_level_settings">
-
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
+    <com.android.settings.preferences.AutoHidePreferenceCategory
+        android:layout="@layout/preference_category"
+        android:key="top_level_extras_category"
+        android:order="-1001" />
     <PreferenceCategory
-        android:order="-140"
+        android:layout="@layout/preference_category"
         android:key="top_level_account_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-    </PreferenceCategory>
-
+        android:order="-140" />
     <com.android.settings.utils.SystemStatsPreference
-        android:order="-140"
-        android:key="first_settings_circle_cards"
         android:layout="@layout/first_settings_circle_cards"
-        android:selectable="false"/>
-
+        android:selectable="false"
+        android:key="first_settings_circle_cards"
+        android:order="-140" />
     <PreferenceCategory
-        android:order="-130"
+        android:layout="@layout/preference_category"
         android:key="top_level_connectivity_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
+        android:order="-130">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.network.NetworkDashboardFragment"
             android:icon="@drawable/ic_homepage_network"
-            android:key="top_level_network"
-            android:order="-20"
             android:title="@string/network_dashboard_title"
+            android:key="top_level_network"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_network"
-            settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.network.NetworkDashboardFragment"
+            settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_network" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
             android:icon="@drawable/ic_homepage_connected_device"
-            android:key="top_level_connected_devices"
-            android:order="-10"
             android:title="@string/connected_devices_dashboard_title"
+            android:key="top_level_connected_devices"
             android:summary="@string/connected_devices_dashboard_default_summary"
-            settings:highlightableMenuKey="@string/menu_key_connected_devices"
-            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
+            android:order="-10"
+            android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
+            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_connected_devices" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-120"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_personalize_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
+        android:order="-120">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.rising.settings.PersonalizationsFragment"
             android:icon="@drawable/ic_homepage_personalization"
-            android:key="top_level_personalizations"
-            android:order="-70"
             android:title="@string/rising_settings_title"
+            android:key="top_level_personalizations"
             android:summary="@string/rising_settings_summary"
-            settings:controller="com.rising.settings.TopLevelSettingsPreferenceController"/>
-
+            android:order="-70"
+            android:fragment="com.rising.settings.PersonalizationsFragment"
+            settings:controller="com.rising.settings.TopLevelSettingsPreferenceController" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.applications.AppDashboardFragment"
             android:icon="@drawable/ic_homepage_apps"
-            android:key="top_level_apps"
-            android:order="-60"
             android:title="@string/apps_dashboard_title"
+            android:key="top_level_apps"
             android:summary="@string/app_and_notification_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_apps"/>
-
+            android:order="-60"
+            android:fragment="com.android.settings.applications.AppDashboardFragment"
+            settings:highlightableMenuKey="@string/menu_key_apps" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
             android:icon="@drawable/ic_homepage_notification"
-            android:key="top_level_notifications"
-            android:order="-50"
             android:title="@string/configure_notification_settings"
+            android:key="top_level_notifications"
             android:summary="@string/notification_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_notifications"/>
-
+            android:order="-50"
+            android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
+            settings:highlightableMenuKey="@string/menu_key_notifications" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.notification.SoundSettings"
             android:icon="@drawable/ic_homepage_sound"
-            android:key="top_level_sound"
-            android:order="-40"
             android:title="@string/sound_settings"
+            android:key="top_level_sound"
             android:summary="@string/sound_dashboard_summary_with_dnd"
-            settings:highlightableMenuKey="@string/menu_key_sound"
-            settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>
-
+            android:order="-40"
+            android:fragment="com.android.settings.notification.SoundSettings"
+            settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_sound" />
         <com.android.settings.widget.RestrictedHomepagePreference
-            android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
             android:icon="@drawable/ic_homepage_modes"
+            android:title="@string/zen_modes_list_title"
             android:key="top_level_priority_modes"
             android:order="-35"
-            android:title="@string/zen_modes_list_title"
-            settings:useAdminDisabledSummary="true"
+            android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
+            settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"
             settings:highlightableMenuKey="@string/menu_key_priority_modes"
-            settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"/>
-
+            settings:useAdminDisabledSummary="true" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.communal.CommunalDashboardFragment"
             android:icon="@drawable/ic_homepage_hub_mode"
-            android:key="top_level_communal"
-            android:order="-30"
             android:title="@string/communal_settings_title"
+            android:key="top_level_communal"
             android:summary="@string/communal_settings_summary"
-            settings:highlightableMenuKey="@string/menu_key_communal"
-            settings:controller="com.android.settings.communal.CommunalPreferenceController"/>
-
+            android:order="-30"
+            android:fragment="com.android.settings.communal.CommunalDashboardFragment"
+            settings:controller="com.android.settings.communal.CommunalPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_communal" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.DisplaySettings"
             android:icon="@drawable/ic_homepage_display"
-            android:key="top_level_display"
-            android:order="-20"
             android:title="@string/display_settings"
+            android:key="top_level_display"
             android:summary="@string/display_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_display"
-            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.DisplaySettings"
+            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_display" />
         <com.android.settings.widget.RestrictedHomepagePreference
             android:icon="@drawable/ic_homepage_wallpaper"
-            android:key="top_level_wallpaper"
-            android:order="-10"
             android:title="@string/wallpaper_settings_title"
+            android:key="top_level_wallpaper"
             android:summary="@string/wallpaper_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_wallpaper"
-            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
+            android:order="-10"
+            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_wallpaper" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-110"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_system_info_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
+        android:order="-110">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.system.SystemDashboardFragment"
             android:icon="@drawable/ic_homepage_system_dashboard"
-            android:key="top_level_system"
-            android:order="-20"
             android:title="@string/header_category_system"
+            android:key="top_level_system"
             android:summary="@string/system_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_system"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.system.SystemDashboardFragment"
+            settings:highlightableMenuKey="@string/menu_key_system" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
             android:icon="@drawable/ic_homepage_about"
-            android:key="top_level_about_device"
-            android:order="-10"
             android:title="@string/about_settings"
+            android:key="top_level_about_device"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_about_device"
-            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
+            android:order="-10"
+            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
+            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_about_device" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-100"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_security_privacy_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
+        android:order="-100">
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_homepage_safety_center"
-            android:key="top_level_safety_center"
-            android:order="-50"
             android:title="@string/safety_center_title"
+            android:key="top_level_safety_center"
             android:summary="@string/safety_center_summary"
-            settings:highlightableMenuKey="@string/menu_key_safety_center"
-            settings:controller="com.android.settings.safetycenter.TopLevelSafetyCenterEntryPreferenceController"/>
-
+            android:order="-50"
+            settings:controller="com.android.settings.safetycenter.TopLevelSafetyCenterEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_safety_center" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.security.SecuritySettings"
             android:icon="@drawable/ic_homepage_security"
-            android:key="top_level_security"
-            android:order="-40"
             android:title="@string/security_settings_title"
+            android:key="top_level_security"
             android:summary="@string/security_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_security"
-            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
-
+            android:order="-40"
+            android:fragment="com.android.settings.security.SecuritySettings"
+            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_security" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
             android:icon="@drawable/ic_homepage_privacy"
-            android:key="top_level_privacy"
-            android:order="-30"
             android:title="@string/privacy_dashboard_title"
+            android:key="top_level_privacy"
             android:summary="@string/privacy_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_privacy"
-            settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"/>
-
+            android:order="-30"
+            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
+            settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_privacy" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.location.LocationSettings"
             android:icon="@drawable/ic_homepage_location"
-            android:key="top_level_location"
-            android:order="-20"
             android:title="@string/location_settings_title"
+            android:key="top_level_location"
             android:summary="@string/location_settings_loading_app_permission_stats"
-            settings:highlightableMenuKey="@string/menu_key_location"
-            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.location.LocationSettings"
+            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_location" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
             android:icon="@drawable/ic_homepage_accounts"
-            android:key="top_level_accounts"
-            android:order="-10"
             android:title="@string/account_dashboard_title_with_passkeys"
+            android:key="top_level_accounts"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_accounts"
-            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
-
+            android:order="-10"
+            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_accounts" />
         <com.android.settings.widget.HomepagePreference
-            android:key="top_level_supervision"
+            android:icon="@drawable/ic_homepage_supervision"
             android:title="@string/supervision_settings_title"
+            android:key="top_level_supervision"
             android:summary="@string/supervision_settings_summary"
-            android:icon="@drawable/ic_homepage_supervision"
             android:order="5"
             android:fragment="com.android.settings.supervision.SupervisionDashboardFragment"
-            settings:highlightableMenuKey="@string/menu_key_supervision"
-            settings:controller="com.android.settings.supervision.TopLevelSupervisionPreferenceController"/>
-
+            settings:controller="com.android.settings.supervision.TopLevelSupervisionPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_supervision" />
         <com.android.settings.widget.HomepagePreference
-            android:key="top_level_emergency"
+            android:icon="@drawable/ic_homepage_emergency"
             android:title="@string/emergency_settings_preference_title"
+            android:key="top_level_emergency"
             android:summary="@string/emergency_dashboard_summary"
-            android:icon="@drawable/ic_homepage_emergency"
             android:order="10"
             android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"
-            settings:isPreferenceVisible="@bool/config_show_emergency_settings"
-            settings:highlightableMenuKey="@string/menu_key_emergency"/>
+            settings:highlightableMenuKey="@string/menu_key_emergency"
+            settings:isPreferenceVisible="@bool/config_show_emergency_settings" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="100"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_support_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-
+        android:order="100">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
             android:icon="@drawable/ic_homepage_accessibility"
-            android:key="top_level_accessibility"
-            android:order="-20"
             android:title="@string/accessibility_settings"
+            android:key="top_level_accessibility"
             android:summary="@string/accessibility_settings_summary"
-            settings:highlightableMenuKey="@string/menu_key_accessibility"
-            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_accessibility" />
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_homepage_support"
-            android:key="top_level_support"
-            android:order="-10"
             android:title="@string/page_tab_title_support"
+            android:key="top_level_support"
             android:summary="@string/support_summary"
-            settings:highlightableMenuKey="@string/menu_key_support"
-            settings:controller="com.android.settings.support.SupportPreferenceController"/>
+            android:order="-10"
+            settings:controller="com.android.settings.support.SupportPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_support" />
     </PreferenceCategory>
-
-</PreferenceScreen>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/top_level_settings_simple.xml b/res/xml/top_level_settings_simple.xml
index 819cc6b0302..b334142ca11 100644
--- a/res/xml/top_level_settings_simple.xml
+++ b/res/xml/top_level_settings_simple.xml
@@ -1,315 +1,257 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2024 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
 <PreferenceScreen
+    android:key="top_level_settings"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="top_level_settings">
-
-    <!-- This category should hold uncategorized preferences such as OEM parts, unknown dashboard injects etc -->
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
     <com.android.settings.preferences.AutoHidePreferenceCategory
-        android:order="-1001"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_extras_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-    </com.android.settings.preferences.AutoHidePreferenceCategory>
-
+        android:order="-1001" />
     <com.android.settings.preferences.AutoHidePreferenceCategory
-        android:order="-152"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_account_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-        
+        android:order="-152">
         <com.android.settings.widget.AvatarHomePagePreference
             android:icon="@drawable/ic_heart"
-            android:key="top_level_usercard"
-            android:order="-152"
             android:title="@string/user_card_title"
-            android:summary="@string/user_card_summary"/>
-
+            android:key="top_level_usercard"
+            android:summary="@string/user_card_summary"
+            android:order="-152" />
     </com.android.settings.preferences.AutoHidePreferenceCategory>
-
     <PreferenceCategory
-        android:order="-130"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_connectivity_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
+        android:order="-130">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.network.NetworkDashboardFragment"
             android:icon="@drawable/ic_custom_wireless"
-            android:key="top_level_network"
-            android:order="-20"
             android:title="@string/network_dashboard_title"
+            android:key="top_level_network"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_network"
-            settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.network.NetworkDashboardFragment"
+            settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_network" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
             android:icon="@drawable/ic_custom_devices"
-            android:key="top_level_connected_devices"
-            android:order="-10"
             android:title="@string/connected_devices_dashboard_title"
+            android:key="top_level_connected_devices"
             android:summary="@string/connected_devices_dashboard_default_summary"
-            settings:highlightableMenuKey="@string/menu_key_connected_devices"
-            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
+            android:order="-10"
+            android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
+            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_connected_devices" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-125"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_personalize_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-
+        android:order="-125">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.rising.settings.PersonalizationsFragment"
             android:icon="@drawable/ic_settings_cogs"
-            android:key="top_level_personalizations"
-            android:order="-63"
             android:title="@string/rising_settings_title"
+            android:key="top_level_personalizations"
             android:summary="@string/rising_settings_summary"
-            settings:controller="com.rising.settings.TopLevelSettingsPreferenceController"/>
-
+            android:order="-63"
+            android:fragment="com.rising.settings.PersonalizationsFragment"
+            settings:controller="com.rising.settings.TopLevelSettingsPreferenceController" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.DisplaySettings"
             android:icon="@drawable/ic_custom_settings_display_white"
-            android:key="top_level_display"
-            android:order="-62"
             android:title="@string/display_settings"
+            android:key="top_level_display"
             android:summary="@string/display_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_display"
-            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
-
+            android:order="-62"
+            android:fragment="com.android.settings.DisplaySettings"
+            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_display" />
         <com.android.settings.widget.RestrictedHomepagePreference
             android:icon="@drawable/ic_custom_settings_wallpaper_white"
-            android:key="top_level_wallpaper"
-            android:order="-61"
             android:title="@string/wallpaper_settings_title"
+            android:key="top_level_wallpaper"
             android:summary="@string/wallpaper_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_wallpaper"
-            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
-
+            android:order="-61"
+            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_wallpaper" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-120"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_system_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-
+        android:order="-120">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.applications.AppDashboardFragment"
             android:icon="@drawable/ic_custom_apps"
-            android:key="top_level_apps"
-            android:order="-60"
             android:title="@string/apps_dashboard_title"
+            android:key="top_level_apps"
             android:summary="@string/app_and_notification_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_apps"/>
-
+            android:order="-60"
+            android:fragment="com.android.settings.applications.AppDashboardFragment"
+            settings:highlightableMenuKey="@string/menu_key_apps" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
             android:icon="@drawable/ic_custom_notifications"
-            android:key="top_level_notifications"
-            android:order="-50"
             android:title="@string/configure_notification_settings"
+            android:key="top_level_notifications"
             android:summary="@string/notification_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_notifications"/>
-
+            android:order="-50"
+            android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
+            settings:highlightableMenuKey="@string/menu_key_notifications" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.notification.SoundSettings"
             android:icon="@drawable/ic_custom_sound"
-            android:key="top_level_sound"
-            android:order="-40"
             android:title="@string/sound_settings"
+            android:key="top_level_sound"
             android:summary="@string/sound_dashboard_summary_with_dnd"
-            settings:highlightableMenuKey="@string/menu_key_sound"
-            settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>
-
+            android:order="-40"
+            android:fragment="com.android.settings.notification.SoundSettings"
+            settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_sound" />
         <com.android.settings.widget.RestrictedHomepagePreference
-            android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
-            android:icon="@*android:drawable/ic_zen_priority_modes"
+            android:icon="@android:drawable/item_background_material_dark"
+            android:title="@string/zen_modes_list_title"
             android:key="top_level_priority_modes"
             android:order="-35"
-            android:title="@string/zen_modes_list_title"
-            settings:useAdminDisabledSummary="true"
+            android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
+            settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"
             settings:highlightableMenuKey="@string/menu_key_priority_modes"
-            settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"/>
-
+            settings:useAdminDisabledSummary="true" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.communal.CommunalDashboardFragment"
             android:icon="@drawable/ia_settings_communal"
-            android:key="top_level_communal"
-            android:order="-30"
             android:title="@string/communal_settings_title"
+            android:key="top_level_communal"
             android:summary="@string/communal_settings_summary"
-            settings:highlightableMenuKey="@string/menu_key_communal"
-            settings:controller="com.android.settings.communal.CommunalPreferenceController"/>
-
+            android:order="-30"
+            android:fragment="com.android.settings.communal.CommunalDashboardFragment"
+            settings:controller="com.android.settings.communal.CommunalPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_communal" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
             android:icon="@drawable/ic_custom_storage_white"
-            android:key="top_level_storage"
-            android:order="-50"
             android:title="@string/storage_settings"
+            android:key="top_level_storage"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_storage"
-            settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
-
+            android:order="-50"
+            android:fragment="com.android.settings.deviceinfo.StorageDashboardFragment"
+            settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_storage" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageSummary"
             android:icon="@drawable/ic_custom_settings_battery_white"
-            android:key="top_level_battery"
-            android:order="-30"
             android:title="@string/power_usage_summary_title"
+            android:key="top_level_battery"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_battery"
-            settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
-
+            android:order="-30"
+            android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageSummary"
+            settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_battery" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-100"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_security_privacy_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-        
+        android:order="-100">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
             android:icon="@drawable/ic_custom_settings_accessibility"
-            android:key="top_level_accessibility"
-            android:order="-60"
             android:title="@string/accessibility_settings"
+            android:key="top_level_accessibility"
             android:summary="@string/accessibility_settings_summary"
-            settings:highlightableMenuKey="@string/menu_key_accessibility"
-            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
-
+            android:order="-60"
+            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_accessibility" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.security.SecuritySettings"
             android:icon="@drawable/ic_custom_settings_security_white"
-            android:key="top_level_security"
-            android:order="-50"
             android:title="@string/security_settings_title"
+            android:key="top_level_security"
             android:summary="@string/security_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_security"
-            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
-
+            android:order="-50"
+            android:fragment="com.android.settings.security.SecuritySettings"
+            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_security" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.location.LocationSettings"
             android:icon="@drawable/ic_custom_settings_location"
-            android:key="top_level_location"
-            android:order="-40"
             android:title="@string/location_settings_title"
+            android:key="top_level_location"
             android:summary="@string/location_settings_loading_app_permission_stats"
-            settings:highlightableMenuKey="@string/menu_key_location"
-            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
-
+            android:order="-40"
+            android:fragment="com.android.settings.location.LocationSettings"
+            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_location" />
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_custom_settings_safety_center"
-            android:key="top_level_safety_center"
-            android:order="-30"
             android:title="@string/safety_center_title"
+            android:key="top_level_safety_center"
             android:summary="@string/safety_center_summary"
-            settings:highlightableMenuKey="@string/menu_key_safety_center"
-            settings:controller="com.android.settings.safetycenter.TopLevelSafetyCenterEntryPreferenceController"/>
-
+            android:order="-30"
+            settings:controller="com.android.settings.safetycenter.TopLevelSafetyCenterEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_safety_center" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
             android:icon="@drawable/ic_custom_settings_privacy"
-            android:key="top_level_privacy"
-            android:order="-20"
             android:title="@string/privacy_dashboard_title"
+            android:key="top_level_privacy"
             android:summary="@string/privacy_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_privacy"
-            settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
+            settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_privacy" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
             android:icon="@drawable/ic_custom_settings_accounts"
-            android:key="top_level_accounts"
-            android:order="-10"
             android:title="@string/account_dashboard_title_with_passkeys"
+            android:key="top_level_accounts"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_accounts"
-            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
-
+            android:order="-10"
+            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_accounts" />
         <com.android.settings.widget.HomepagePreference
-            android:key="top_level_emergency"
+            android:icon="@drawable/ic_custom_settings_emergency"
             android:title="@string/emergency_settings_preference_title"
+            android:key="top_level_emergency"
             android:summary="@string/emergency_dashboard_summary"
-            android:icon="@drawable/ic_custom_settings_emergency"
             android:order="10"
             android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"
-            settings:isPreferenceVisible="@bool/config_show_emergency_settings"
-            settings:highlightableMenuKey="@string/menu_key_emergency"/>
-
+            settings:highlightableMenuKey="@string/menu_key_emergency"
+            settings:isPreferenceVisible="@bool/config_show_emergency_settings" />
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_homepage_wellbeing"
-            android:key="top_level_wb"
-            android:order="20"
             android:title="@string/wellbeing_title"
+            android:key="top_level_wb"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="top_level_wellbeing"
-            settings:controller="com.android.settings.home.WellbeingPreferenceController"/>
-
+            android:order="20"
+            settings:controller="com.android.settings.home.WellbeingPreferenceController"
+            settings:highlightableMenuKey="top_level_wellbeing" />
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_homepage_google"
-            android:key="top_level_services"
-            android:order="30"
             android:title="@string/gms_enabled_title"
+            android:key="top_level_services"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="top_level_google"
-            settings:controller="com.android.settings.home.GooglePreferenceController"/>
-
+            android:order="30"
+            settings:controller="com.android.settings.home.GooglePreferenceController"
+            settings:highlightableMenuKey="top_level_google" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="100"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_support_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-
+        android:order="100">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.system.SystemDashboardFragment"
             android:icon="@drawable/ic_custom_settings_system_dashboard_white"
-            android:key="top_level_system"
-            android:order="20"
             android:title="@string/header_category_system"
+            android:key="top_level_system"
             android:summary="@string/system_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_system"/>
-
+            android:order="20"
+            android:fragment="com.android.settings.system.SystemDashboardFragment"
+            settings:highlightableMenuKey="@string/menu_key_system" />
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_help_filled"
-            android:key="top_level_support"
-            android:order="30"
             android:title="@string/page_tab_title_support"
+            android:key="top_level_support"
             android:summary="@string/support_summary"
-            settings:highlightableMenuKey="@string/menu_key_support"
-            settings:controller="com.android.settings.support.SupportPreferenceController"/>
-
+            android:order="30"
+            settings:controller="com.android.settings.support.SupportPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_support" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
             android:icon="@drawable/ic_custom_settings_about_device"
-            android:key="top_level_about_device"
-            android:order="40"
             android:title="@string/about_settings"
+            android:key="top_level_about_device"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_about_device"
-            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
-
+            android:order="40"
+            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
+            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_about_device" />
     </PreferenceCategory>
-
     <com.android.settings.preferences.HiddenPreferenceCategory
-        android:order="150"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_system_info_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-
-    </com.android.settings.preferences.HiddenPreferenceCategory>
-
-</PreferenceScreen>
+        android:order="150" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/top_level_settings_v2.xml b/res/xml/top_level_settings_v2.xml
index 8f106936ea0..aee4a31ff2b 100644
--- a/res/xml/top_level_settings_v2.xml
+++ b/res/xml/top_level_settings_v2.xml
@@ -1,311 +1,253 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2024 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
 <PreferenceScreen
+    android:key="top_level_settings"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="top_level_settings">
-
-    <!-- This category should hold uncategorized preferences such as OEM parts, unknown dashboard injects etc -->
+    xmlns:settings="http://schemas.android.com/apk/res-auto">
     <com.android.settings.preferences.AutoHidePreferenceCategory
-        android:order="-1001"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_extras_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-    </com.android.settings.preferences.AutoHidePreferenceCategory>
-
+        android:order="-1001" />
     <com.android.settings.preferences.AutoHidePreferenceCategory
-        android:order="-152"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_account_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-        
+        android:order="-152">
         <com.android.settings.widget.AvatarHomePagePreference
             android:icon="@drawable/ic_heart"
-            android:key="top_level_usercard"
-            android:order="-152"
             android:title="@string/user_card_title"
-            android:summary="@string/user_card_summary"/>
-
+            android:key="top_level_usercard"
+            android:summary="@string/user_card_summary"
+            android:order="-152" />
     </com.android.settings.preferences.AutoHidePreferenceCategory>
-
     <com.android.settings.utils.SystemStatsPreference
-        android:order="-140"
-        android:key="first_settings_circle_cards"
         android:layout="@layout/first_settings_circle_cards"
-        android:selectable="false"/>
-
+        android:selectable="false"
+        android:key="first_settings_circle_cards"
+        android:order="-140" />
     <PreferenceCategory
-        android:order="-130"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_connectivity_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
+        android:order="-130">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.network.NetworkDashboardFragment"
             android:icon="@drawable/ic_custom_wireless"
-            android:key="top_level_network"
-            android:order="-20"
             android:title="@string/network_dashboard_title"
+            android:key="top_level_network"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_network"
-            settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.network.NetworkDashboardFragment"
+            settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_network" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
             android:icon="@drawable/ic_custom_devices"
-            android:key="top_level_connected_devices"
-            android:order="-10"
             android:title="@string/connected_devices_dashboard_title"
+            android:key="top_level_connected_devices"
             android:summary="@string/connected_devices_dashboard_default_summary"
-            settings:highlightableMenuKey="@string/menu_key_connected_devices"
-            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
+            android:order="-10"
+            android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
+            settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_connected_devices" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-125"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_personalize_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-
+        android:order="-125">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.rising.settings.PersonalizationsFragment"
             android:icon="@drawable/ic_settings_cogs"
-            android:key="top_level_personalizations"
-            android:order="-63"
             android:title="@string/rising_settings_title"
+            android:key="top_level_personalizations"
             android:summary="@string/rising_settings_summary"
-            settings:controller="com.rising.settings.TopLevelSettingsPreferenceController"/>
-
+            android:order="-63"
+            android:fragment="com.rising.settings.PersonalizationsFragment"
+            settings:controller="com.rising.settings.TopLevelSettingsPreferenceController" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.DisplaySettings"
             android:icon="@drawable/ic_custom_settings_display_white"
-            android:key="top_level_display"
-            android:order="-62"
             android:title="@string/display_settings"
+            android:key="top_level_display"
             android:summary="@string/display_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_display"
-            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
-
+            android:order="-62"
+            android:fragment="com.android.settings.DisplaySettings"
+            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_display" />
         <com.android.settings.widget.RestrictedHomepagePreference
             android:icon="@drawable/ic_custom_settings_wallpaper_white"
-            android:key="top_level_wallpaper"
-            android:order="-61"
             android:title="@string/wallpaper_settings_title"
+            android:key="top_level_wallpaper"
             android:summary="@string/wallpaper_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_wallpaper"
-            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
-
+            android:order="-61"
+            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_wallpaper" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-120"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_system_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-
+        android:order="-120">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.applications.AppDashboardFragment"
             android:icon="@drawable/ic_custom_apps"
-            android:key="top_level_apps"
-            android:order="-60"
             android:title="@string/apps_dashboard_title"
+            android:key="top_level_apps"
             android:summary="@string/app_and_notification_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_apps"/>
-
+            android:order="-60"
+            android:fragment="com.android.settings.applications.AppDashboardFragment"
+            settings:highlightableMenuKey="@string/menu_key_apps" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
             android:icon="@drawable/ic_custom_notifications"
-            android:key="top_level_notifications"
-            android:order="-50"
             android:title="@string/configure_notification_settings"
+            android:key="top_level_notifications"
             android:summary="@string/notification_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_notifications"/>
-
+            android:order="-50"
+            android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
+            settings:highlightableMenuKey="@string/menu_key_notifications" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.notification.SoundSettings"
             android:icon="@drawable/ic_custom_sound"
-            android:key="top_level_sound"
-            android:order="-40"
             android:title="@string/sound_settings"
+            android:key="top_level_sound"
             android:summary="@string/sound_dashboard_summary_with_dnd"
-            settings:highlightableMenuKey="@string/menu_key_sound"
-            settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"/>
-
+            android:order="-40"
+            android:fragment="com.android.settings.notification.SoundSettings"
+            settings:controller="com.android.settings.sound.TopLevelSoundPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_sound" />
         <com.android.settings.widget.RestrictedHomepagePreference
-            android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
-            android:icon="@*android:drawable/ic_zen_priority_modes"
+            android:icon="@android:drawable/item_background_material_dark"
+            android:title="@string/zen_modes_list_title"
             android:key="top_level_priority_modes"
             android:order="-35"
-            android:title="@string/zen_modes_list_title"
-            settings:useAdminDisabledSummary="true"
+            android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
+            settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"
             settings:highlightableMenuKey="@string/menu_key_priority_modes"
-            settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"/>
-
+            settings:useAdminDisabledSummary="true" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.communal.CommunalDashboardFragment"
             android:icon="@drawable/ia_settings_communal"
-            android:key="top_level_communal"
-            android:order="-30"
             android:title="@string/communal_settings_title"
+            android:key="top_level_communal"
             android:summary="@string/communal_settings_summary"
-            settings:highlightableMenuKey="@string/menu_key_communal"
-            settings:controller="com.android.settings.communal.CommunalPreferenceController"/>
-
+            android:order="-30"
+            android:fragment="com.android.settings.communal.CommunalDashboardFragment"
+            settings:controller="com.android.settings.communal.CommunalPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_communal" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="-100"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_security_privacy_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-        
+        android:order="-100">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
             android:icon="@drawable/ic_custom_settings_accessibility"
-            android:key="top_level_accessibility"
-            android:order="-60"
             android:title="@string/accessibility_settings"
+            android:key="top_level_accessibility"
             android:summary="@string/accessibility_settings_summary"
-            settings:highlightableMenuKey="@string/menu_key_accessibility"
-            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
-
+            android:order="-60"
+            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_accessibility" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.security.SecuritySettings"
             android:icon="@drawable/ic_custom_settings_security_white"
-            android:key="top_level_security"
-            android:order="-50"
             android:title="@string/security_settings_title"
+            android:key="top_level_security"
             android:summary="@string/security_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_security"
-            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
-
+            android:order="-50"
+            android:fragment="com.android.settings.security.SecuritySettings"
+            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_security" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.location.LocationSettings"
             android:icon="@drawable/ic_custom_settings_location"
-            android:key="top_level_location"
-            android:order="-40"
             android:title="@string/location_settings_title"
+            android:key="top_level_location"
             android:summary="@string/location_settings_loading_app_permission_stats"
-            settings:highlightableMenuKey="@string/menu_key_location"
-            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
-
+            android:order="-40"
+            android:fragment="com.android.settings.location.LocationSettings"
+            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_location" />
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_custom_settings_safety_center"
-            android:key="top_level_safety_center"
-            android:order="-30"
             android:title="@string/safety_center_title"
+            android:key="top_level_safety_center"
             android:summary="@string/safety_center_summary"
-            settings:highlightableMenuKey="@string/menu_key_safety_center"
-            settings:controller="com.android.settings.safetycenter.TopLevelSafetyCenterEntryPreferenceController"/>
-
+            android:order="-30"
+            settings:controller="com.android.settings.safetycenter.TopLevelSafetyCenterEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_safety_center" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
             android:icon="@drawable/ic_custom_settings_privacy"
-            android:key="top_level_privacy"
-            android:order="-20"
             android:title="@string/privacy_dashboard_title"
+            android:key="top_level_privacy"
             android:summary="@string/privacy_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_privacy"
-            settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"/>
-
+            android:order="-20"
+            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
+            settings:controller="com.android.settings.privacy.TopLevelPrivacyEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_privacy" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
             android:icon="@drawable/ic_custom_settings_accounts"
-            android:key="top_level_accounts"
-            android:order="-10"
             android:title="@string/account_dashboard_title_with_passkeys"
+            android:key="top_level_accounts"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_accounts"
-            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
-
+            android:order="-10"
+            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_accounts" />
         <com.android.settings.widget.HomepagePreference
-            android:key="top_level_supervision"
+            android:icon="@drawable/ic_account_child_invert"
             android:title="@string/supervision_settings_title"
+            android:key="top_level_supervision"
             android:summary="@string/supervision_settings_summary"
-            android:icon="@drawable/ic_account_child_invert"
             android:order="5"
             android:fragment="com.android.settings.supervision.SupervisionDashboardFragment"
-            settings:highlightableMenuKey="@string/menu_key_supervision"
-            settings:controller="com.android.settings.supervision.TopLevelSupervisionPreferenceController"/>
-
+            settings:controller="com.android.settings.supervision.TopLevelSupervisionPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_supervision" />
         <com.android.settings.widget.HomepagePreference
-            android:key="top_level_emergency"
+            android:icon="@drawable/ic_custom_settings_emergency"
             android:title="@string/emergency_settings_preference_title"
+            android:key="top_level_emergency"
             android:summary="@string/emergency_dashboard_summary"
-            android:icon="@drawable/ic_custom_settings_emergency"
             android:order="10"
             android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"
-            settings:isPreferenceVisible="@bool/config_show_emergency_settings"
-            settings:highlightableMenuKey="@string/menu_key_emergency"/>
-
+            settings:highlightableMenuKey="@string/menu_key_emergency"
+            settings:isPreferenceVisible="@bool/config_show_emergency_settings" />
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_homepage_wellbeing"
-            android:key="top_level_wb"
-            android:order="20"
             android:title="@string/wellbeing_title"
+            android:key="top_level_wb"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="top_level_wellbeing"
-            settings:controller="com.android.settings.home.WellbeingPreferenceController"/>
-
+            android:order="20"
+            settings:controller="com.android.settings.home.WellbeingPreferenceController"
+            settings:highlightableMenuKey="top_level_wellbeing" />
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_homepage_google"
-            android:key="top_level_services"
-            android:order="30"
             android:title="@string/gms_enabled_title"
+            android:key="top_level_services"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="top_level_google"
-            settings:controller="com.android.settings.home.GooglePreferenceController"/>
-
+            android:order="30"
+            settings:controller="com.android.settings.home.GooglePreferenceController"
+            settings:highlightableMenuKey="top_level_google" />
     </PreferenceCategory>
-
     <PreferenceCategory
-        android:order="100"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_support_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-
+        android:order="100">
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.system.SystemDashboardFragment"
             android:icon="@drawable/ic_custom_settings_system_dashboard_white"
-            android:key="top_level_system"
-            android:order="20"
             android:title="@string/header_category_system"
+            android:key="top_level_system"
             android:summary="@string/system_dashboard_summary"
-            settings:highlightableMenuKey="@string/menu_key_system"/>
-
+            android:order="20"
+            android:fragment="com.android.settings.system.SystemDashboardFragment"
+            settings:highlightableMenuKey="@string/menu_key_system" />
         <com.android.settings.widget.HomepagePreference
             android:icon="@drawable/ic_help_filled"
-            android:key="top_level_support"
-            android:order="30"
             android:title="@string/page_tab_title_support"
+            android:key="top_level_support"
             android:summary="@string/support_summary"
-            settings:highlightableMenuKey="@string/menu_key_support"
-            settings:controller="com.android.settings.support.SupportPreferenceController"/>
-
+            android:order="30"
+            settings:controller="com.android.settings.support.SupportPreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_support" />
         <com.android.settings.widget.HomepagePreference
-            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
             android:icon="@drawable/ic_custom_settings_about_device"
-            android:key="top_level_about_device"
-            android:order="40"
             android:title="@string/about_settings"
+            android:key="top_level_about_device"
             android:summary="@string/summary_placeholder"
-            settings:highlightableMenuKey="@string/menu_key_about_device"
-            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
-
+            android:order="40"
+            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
+            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"
+            settings:highlightableMenuKey="@string/menu_key_about_device" />
     </PreferenceCategory>
-
     <com.android.settings.preferences.HiddenPreferenceCategory
-        android:order="150"
+        android:layout="@layout/settingslib_preference_category_no_title"
         android:key="top_level_system_info_category"
-        android:layout="@layout/settingslib_preference_category_no_title">
-
-    </com.android.settings.preferences.HiddenPreferenceCategory>
-
-</PreferenceScreen>
+        android:order="150" />
+</PreferenceScreen>
\ No newline at end of file