Merge "Rename settings option for autolocking on inactivity" into main

2024-05-15 17:12:05 +00:00
parent b06a4f74a1 72089c3289
commit c1e5095b8f
2 changed files with 3 additions and 3 deletions
--- 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");
    }

    /**