From 72089c3289465b3a7ecbe220b1e2af9ef5a36540 Mon Sep 17 00:00:00 2001
From: Jigar Thakkar <jigarthakkar@google.com>
Date: Thu, 2 May 2024 11:18:36 +0000
Subject: [PATCH] Rename settings option for autolocking on inactivity

Bug:328016823
Test: atest AutoLockPreferenceControllerTest
Flag: ACONFIG android.multiuser.support_autolock_for_private_space NEXT

Change-Id: Id4537efe5ac56df0fc98cef3ce6673a0673e0fba
---
 res/values/strings.xml                                        | 4 ++--
 .../autolock/AutoLockPreferenceControllerTest.java            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1a83b79296e..f484bfefed6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1257,8 +1257,8 @@
     <string name="private_space_auto_lock_page_summary">You can lock your private space automatically if you haven\’t used your device for a period of time</string>
     <!-- Configure auto lock: Value for auto lock configuration to lock private space every time device locks. [CHAR LIMIT=40] -->
     <string name="private_space_auto_lock_every_time">Every time device locks</string>
-    <!-- Configure auto lock: Value for auto lock configuration to lock private space after 5 minutes of inactivity. [CHAR LIMIT=40] -->
-    <string name="private_space_auto_lock_after_inactivity">After 5 minutes of inactivity</string>
+    <!-- Configure auto lock: Value for auto lock configuration to lock private space after 5 minutes of inactivity post screen timeout. [CHAR LIMIT=40] -->
+    <string name="private_space_auto_lock_after_inactivity">5 minutes after screen timeout</string>
     <!-- Configure auto lock: Value for auto lock configuration to lock private space only after device restarts. [CHAR LIMIT=40] -->
     <string name="private_space_auto_lock_after_device_restart">Only after device restarts</string>
     <!-- Title for the settings page for hiding private space. [CHAR LIMIT=45] -->
diff --git a/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockPreferenceControllerTest.java b/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockPreferenceControllerTest.java
index 3a605ea1727..fb2cdddd349 100644
--- a/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/privatespace/autolock/AutoLockPreferenceControllerTest.java
@@ -127,7 +127,7 @@ public class AutoLockPreferenceControllerTest {
                 Settings.Secure.PRIVATE_SPACE_AUTO_LOCK,
                 Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY);
         assertThat(mAutoLockPreferenceController.getSummary().toString())
-                .isEqualTo("After 5 minutes of inactivity");
+                .isEqualTo("5 minutes after screen timeout");
     }
 
     /**