Merge pull request #4204 from nextcloud/timeout-immediate

Added option `Immediate` for passcode timeout.
nextcloud · Jan 15, 2025 · 6241c68 · 6241c68
2 parents fdb38de + 6c67bf7
commit 6241c68
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/app/src/main/res/values-v28/arrays.xml b/app/src/main/res/values-v28/arrays.xml
@@ -26,20 +26,23 @@
     </array>
 
     <array name="screen_lock_timeout_descriptions">
+        <item>@string/nc_screen_lock_timeout_immediate</item>
         <item>@string/nc_screen_lock_timeout_30</item>
         <item>@string/nc_screen_lock_timeout_60</item>
         <item>@string/nc_screen_lock_timeout_300</item>
         <item>@string/nc_screen_lock_timeout_600</item>
     </array>
 
     <array name="screen_lock_timeout_entry_values">
+        <item>@string/nc_screen_lock_timeout_immediate</item>
         <item>@string/nc_screen_lock_timeout_thirty</item>
         <item>@string/nc_screen_lock_timeout_sixty</item>
         <item>@string/nc_screen_lock_timeout_three_hundred</item>
         <item>@string/nc_screen_lock_timeout_six_hundred</item>
     </array>
 
     <array name="screen_lock_timeout_entry_int_values">
+        <item>1</item>
         <item>30</item>
         <item>60</item>
         <item>300</item>

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -45,20 +45,23 @@
     </array>
 
     <array name="screen_lock_timeout_descriptions">
+        <item>@string/nc_screen_lock_timeout_immediate</item>
         <item>@string/nc_screen_lock_timeout_30</item>
         <item>@string/nc_screen_lock_timeout_60</item>
         <item>@string/nc_screen_lock_timeout_300</item>
         <item>@string/nc_screen_lock_timeout_600</item>
     </array>
 
     <array name="screen_lock_timeout_entry_values">
+        <item>@string/nc_screen_lock_timeout_immediate</item>
         <item>@string/nc_screen_lock_timeout_thirty</item>
         <item>@string/nc_screen_lock_timeout_sixty</item>
         <item>@string/nc_screen_lock_timeout_three_hundred</item>
         <item>@string/nc_screen_lock_timeout_six_hundred</item>
     </array>
 
     <array name="screen_lock_timeout_entry_int_values">
+        <item>1</item>
         <item>30</item>
         <item>60</item>
         <item>300</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -146,6 +146,7 @@ How to translate with transifex:
     <string name="nc_screen_lock_timeout_300">5 minutes</string>
     <string name="nc_screen_lock_timeout_600">10 minutes</string>
     <string name="nc_screen_lock_timeout_thirty">30</string>
+    <string name="nc_screen_lock_timeout_immediate">Immediate</string>
     <string name="nc_screen_lock_timeout_sixty">60</string>
     <string name="nc_screen_lock_timeout_three_hundred">300</string>
     <string name="nc_screen_lock_timeout_six_hundred">600</string>