Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Screen Lock: Lock after customizable inactivity timeout

Browse Source
This commit is contained in:
Torsten Grote
2018-08-09 12:46:53 -03:00
parent e5112ae9ee
commit 04ffff0953
8 changed files with 146 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
briar-android/src/main/res/values/arrays.xml
View File

@@ -67,4 +67,23 @@
<item>@string/pref_theme_auto_value</item>
<item>@string/pref_theme_system_value</item>
</string-array>
<string-array name="pref_key_lock_timeout_entries">
<item>@string/pref_lock_timeout_never</item>
<item>@string/pref_lock_timeout_1</item>
<item>@string/pref_lock_timeout_5</item>
<item>@string/pref_lock_timeout_15</item>
<item>@string/pref_lock_timeout_30</item>
<item>@string/pref_lock_timeout_60</item>
</string-array>
<string name="pref_lock_timeout_value_default">5</string>
<string name="pref_lock_timeout_value_never">-1</string>
<string-array name="pref_key_lock_timeout_values">
<item>@string/pref_lock_timeout_value_never</item>
<item>1</item>
<item>5</item>
<item>15</item>
<item>30</item>
<item>60</item>
</string-array>
</resources>

9
briar-android/src/main/res/values/strings.xml
View File

@@ -360,6 +360,15 @@
<string name="pref_lock_title">Screen Lock</string>
<string name="pref_lock_summary">Use the device\'s screen lock to protect Briar while signed in</string>
<string name="pref_lock_disabled_summary">Set up a screen lock for your device to protect Briar while signed in</string>
<string name="pref_lock_timeout_title">Screen Lock Inactivity Timeout</string>
<string name="pref_lock_timeout_summary">When not using Briar, automatically lock it %s</string>
<string name="pref_lock_timeout_never">never</string>
<string name="pref_lock_timeout_1">after 1 Minute</string>
<string name="pref_lock_timeout_5">after 5 Minutes</string>
<string name="pref_lock_timeout_15">after 15 Minutes</string>
<string name="pref_lock_timeout_30">after 30 Minutes</string>
<string name="pref_lock_timeout_60">after 1 Hour</string>
<string name="change_password">Change password</string>
<string name="current_password">Current password</string>
<string name="choose_new_password">New password</string>

13
briar-android/src/main/res/xml/settings.xml
View File

@@ -60,8 +60,17 @@
android:key="pref_key_lock"
android:persistent="false"
android:summary="@string/pref_lock_summary"
android:title="@string/pref_lock_title"
android:enabled="false"/>
android:title="@string/pref_lock_title"/>
<ListPreference
android:defaultValue="@string/pref_lock_timeout_value_default"
android:dependency="pref_key_lock"
android:entries="@array/pref_key_lock_timeout_entries"
android:entryValues="@array/pref_key_lock_timeout_values"
android:key="pref_key_lock_timeout"
android:persistent="false"
android:summary="@string/pref_lock_timeout_summary"
android:title="@string/pref_lock_timeout_title"/>
<Preference
android:key="pref_key_change_password"