New options: App Lock and App Lock Timeout.

3 files changed, 75 insertions, 0 deletions

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index a2d77399..f8097c33 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -466,4 +466,42 @@
         <item>@string/exclude_domain</item>
     </string-array>
 
+    <string-array name="settings_app_lock_timeout">
+        <item>@string/app_lock_timeout_immediately</item>
+        <item>@string/app_lock_timeout_1_min</item>
+        <item>@string/app_lock_timeout_2_mins</item>
+        <item>@string/app_lock_timeout_5_mins</item>
+        <item>@string/app_lock_timeout_10_mins</item>
+        <item>@string/app_lock_timeout_15_mins</item>
+        <item>@string/app_lock_timeout_20_mins</item>
+        <item>@string/app_lock_timeout_30_mins</item>
+        <item>@string/app_lock_timeout_1_hour</item>
+        <item>@string/app_lock_timeout_2_hours</item>
+        <item>@string/app_lock_timeout_3_hours</item>
+        <item>@string/app_lock_timeout_4_hours</item>
+        <item>@string/app_lock_timeout_5_hours</item>
+        <item>@string/app_lock_timeout_6_hours</item>
+        <item>@string/app_lock_timeout_12_hours</item>
+        <item>@string/app_lock_timeout_24_hours</item>
+    </string-array>
+
+    <string-array name="settings_app_lock_timeout_values">
+        <item>0</item>
+        <item>60000</item>
+        <item>120000</item>
+        <item>300000</item>
+        <item>600000</item>
+        <item>900000</item>
+        <item>1200000</item>
+        <item>1800000</item>
+        <item>3600000</item>
+        <item>7200000</item>
+        <item>10800000</item>
+        <item>14400000</item>
+        <item>18000000</item>
+        <item>21600000</item>
+        <item>43200000</item>
+        <item>86400000</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1de4ba0f..68ab820b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -597,6 +597,9 @@
     <string name="settings_secure_mode_title">Secure Mode</string>
     <string name="settings_secure_mode_summary">Screenshot and video recording are not allowed. No preview in recent app screen.</string>
     <string name="settings_credits_lock_screen_animation_title">Lock Screen Animation</string>
+    <string name="settings_app_lock_title">App Lock</string>
+    <string name="settings_app_lock_summary">Require authentication before using the app</string>
+    <string name="settings_app_lock_timeout_title">App Lock Timeout</string>
 
     <string name="no_link_available">Cannot get the link</string>
 
@@ -1171,5 +1174,21 @@
     <string name="material_you_notification_title">Applying Material You</string>
 
     <string name="lock_screen_text">Whoa there!!!</string>
+    <string name="app_lock_timeout_immediately">Immediately</string>
+    <string name="app_lock_timeout_1_min">1 minute</string>
+    <string name="app_lock_timeout_2_mins">2 minutes</string>
+    <string name="app_lock_timeout_5_mins">5 minutes</string>
+    <string name="app_lock_timeout_10_mins">10 minutes</string>
+    <string name="app_lock_timeout_15_mins">15 minutes</string>
+    <string name="app_lock_timeout_20_mins">20 minutes</string>
+    <string name="app_lock_timeout_30_mins">30 minutes</string>
+    <string name="app_lock_timeout_1_hour">1 hour</string>
+    <string name="app_lock_timeout_2_hours">2 hours</string>
+    <string name="app_lock_timeout_3_hours">3 hours</string>
+    <string name="app_lock_timeout_4_hours">4 hours</string>
+    <string name="app_lock_timeout_5_hours">5 hours</string>
+    <string name="app_lock_timeout_6_hours">6 hours</string>
+    <string name="app_lock_timeout_12_hours">12 hours</string>
+    <string name="app_lock_timeout_24_hours">24 hours</string>
 
 </resources>
diff --git a/app/src/main/res/xml/security_preferences.xml b/app/src/main/res/xml/security_preferences.xml
index 636f1798..d1f2fbc2 100644
--- a/app/src/main/res/xml/security_preferences.xml
+++ b/app/src/main/res/xml/security_preferences.xml
@@ -11,4 +11,22 @@
         app:title="@string/settings_secure_mode_title"
         app:summary="@string/settings_secure_mode_summary" />
 
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="app_lock"
+        app:icon="@drawable/ic_outline_lock_24dp"
+        app:title="@string/settings_app_lock_title"
+        app:summary="@string/settings_app_lock_summary" />
+
+    <ListPreference
+        app:defaultValue="600000"
+        app:entries="@array/settings_app_lock_timeout"
+        app:entryValues="@array/settings_app_lock_timeout_values"
+        app:key="app_lock_timeout"
+        app:icon="@drawable/ic_outline_access_time_24dp"
+        app:title="@string/settings_app_lock_timeout_title"
+        app:useSimpleSummaryProvider="true" />
+
+
+
 </PreferenceScreen>
\ No newline at end of file