PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jigar Thakkar
2024-05-15 17:12:05 +00:00
committed by Android (Google) Code Review
parent b06a4f74a1 72089c3289
commit c1e5095b8f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -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> <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] --> <!-- 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> <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] --> <!-- 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">After 5 minutes of inactivity</string> <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] --> <!-- 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> <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] --> <!-- Title for the settings page for hiding private space. [CHAR LIMIT=45] -->

2
tests/unit/src/com/android/settings/privatespace/autolock/AutoLockPreferenceControllerTest.java
View File

@@ -127,7 +127,7 @@ public class AutoLockPreferenceControllerTest {
Settings.Secure.PRIVATE_SPACE_AUTO_LOCK, Settings.Secure.PRIVATE_SPACE_AUTO_LOCK,
Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY); Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_AFTER_INACTIVITY);
assertThat(mAutoLockPreferenceController.getSummary().toString()) assertThat(mAutoLockPreferenceController.getSummary().toString())
.isEqualTo("After 5 minutes of inactivity"); .isEqualTo("5 minutes after screen timeout");
} }
/** /**