From ee3a7efa31a8b17158cafa22013be549d9434ab7 Mon Sep 17 00:00:00 2001
From: Manish Singh <psych@google.com>
Date: Mon, 8 Apr 2024 10:59:16 +0000
Subject: [PATCH] Recategorise private space settings items

Bug: 330173096
Test: manual
Change-Id: I7b84ed3b81a985bca9bb4dfd5254e04634489e4b
---
 res/values/strings.xml             |  4 ++++
 res/xml/private_space_settings.xml | 19 ++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b54b82222bf..f3532bd1997 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1396,6 +1396,10 @@
     <string name="private_space_gaia_education_bullet4">Suggested content related to your activity in private space apps</string>
     <!-- Text for button in private space GAIA education screen to start login [CHAR LIMIT=20] -->
     <string name="private_space_gaia_education_got_it">Got it</string>
+    <!-- The title of the category for settings related to the private space lock  [CHAR LIMIT=20] -->
+    <string name="private_space_category_lock">Lock</string>
+    <!-- The title of the category for settings related to hiding the private space  [CHAR LIMIT=20] -->
+    <string name="private_space_category_hide">Hide</string>
 
     <!-- Text shown when "Add fingerprint" button is disabled -->
     <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string>
diff --git a/res/xml/private_space_settings.xml b/res/xml/private_space_settings.xml
index b1233b9d797..b997254a42e 100644
--- a/res/xml/private_space_settings.xml
+++ b/res/xml/private_space_settings.xml
@@ -34,7 +34,14 @@
         settings:searchable="false" />
 
     <PreferenceCategory
-        android:title="@string/security_header">
+        android:title="@string/private_space_category_lock">
+
+        <Preference
+            android:key="private_space_use_one_lock"
+            android:title="@string/private_space_lock_title"
+            android:fragment="com.android.settings.privatespace.onelock.UseOneLockSettingsFragment"
+            settings:controller="com.android.settings.privatespace.onelock.UseOneLockController"
+            settings:searchable="false" />
 
         <Preference
             android:key="private_space_auto_lock"
@@ -43,12 +50,10 @@
             settings:controller="com.android.settings.privatespace.autolock.AutoLockPreferenceController"
             settings:searchable="false" />
 
-        <Preference
-            android:key="private_space_use_one_lock"
-            android:title="@string/private_space_lock_title"
-            android:fragment="com.android.settings.privatespace.onelock.UseOneLockSettingsFragment"
-            settings:controller="com.android.settings.privatespace.onelock.UseOneLockController"
-            settings:searchable="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/private_space_category_hide">
 
         <Preference
             android:key="private_space_hidden"