From 507d987aa3c5ce46d42bd76a4d4d3f12b3c3e6f9 Mon Sep 17 00:00:00 2001
From: Ahaan Ugale <augale@google.com>
Date: Wed, 24 Mar 2021 22:57:29 -0700
Subject: [PATCH] Fix missing accounts category for single profile case.

Bug: 169455298
Test: manual - with no accounts, with an account, with work profile.
 Clicking all preferences work as expected.
Test: make RunSettingsRoboTests
Change-Id: Ie206c52b259d2b6610aa2c6ea52cb276d49266a3
---
 res/xml/accounts_dashboard_settings.xml | 44 ++++++++++++++-----------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/res/xml/accounts_dashboard_settings.xml b/res/xml/accounts_dashboard_settings.xml
index c8627e7e9e7..c50eca4761c 100644
--- a/res/xml/accounts_dashboard_settings.xml
+++ b/res/xml/accounts_dashboard_settings.xml
@@ -46,27 +46,33 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="dashboard_tile_placeholder"
-        android:order="130"/>
+        android:key="accounts_category"
+        android:order="100"
+        android:title="@string/account_settings">
 
-    <SwitchPreference
-        android:key="auto_sync_account_data"
-        android:title="@string/auto_sync_account_title"
-        android:summary="@string/auto_sync_account_summary"
-        android:order="202"
-        settings:allowDividerAbove="true"/>
+        <PreferenceCategory
+            android:key="dashboard_tile_placeholder"
+            android:order="130"/>
 
-    <SwitchPreference
-        android:key="auto_sync_work_account_data"
-        android:title="@string/account_settings_menu_auto_sync_work"
-        android:summary="@string/auto_sync_account_summary"
-        settings:forWork="true"
-        android:order="203"/>
+        <SwitchPreference
+            android:key="auto_sync_account_data"
+            android:title="@string/auto_sync_account_title"
+            android:summary="@string/auto_sync_account_summary"
+            android:order="202"
+            settings:allowDividerAbove="true"/>
 
-    <SwitchPreference
-        android:key="auto_sync_personal_account_data"
-        android:title="@string/account_settings_menu_auto_sync_personal"
-        android:summary="@string/auto_sync_account_summary"
-        android:order="204"/>
+        <SwitchPreference
+            android:key="auto_sync_work_account_data"
+            android:title="@string/account_settings_menu_auto_sync_work"
+            android:summary="@string/auto_sync_account_summary"
+            settings:forWork="true"
+            android:order="203"/>
+
+        <SwitchPreference
+            android:key="auto_sync_personal_account_data"
+            android:title="@string/account_settings_menu_auto_sync_personal"
+            android:summary="@string/auto_sync_account_summary"
+            android:order="204"/>
+    </PreferenceCategory>
 
 </PreferenceScreen>