Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1e5095b authored by Jigar Thakkar's avatar Jigar Thakkar Committed by Android (Google) Code Review
Browse files

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

parents b06a4f74 72089c32
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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] -->
+1 −1
Original line number Diff line number Diff line
@@ -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");
    }

    /**