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

Merge branch 'master' into 'preference-switches'

Browse Source 
# Conflicts:
#   briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
This commit is contained in:
akwizgran
2018-08-14 09:59:22 +00:00
parent 30a070dd13 42031631dd
commit 03191ff08f
52 changed files with 632 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/res/xml/panic_preferences.xml
View File

@@ -12,8 +12,8 @@
android:defaultValue="true"
android:enabled="false"
android:key="pref_key_lock"
android:summary="@string/lock_setting_summary"
android:title="@string/lock_setting_title"/>
android:summary="@string/panic_setting_signout_summary"
android:title="@string/panic_setting_signout_title"/>
<SwitchPreference
android:defaultValue="false"

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

@@ -56,6 +56,13 @@
android:layout="@layout/preferences_category"
android:title="@string/security_settings_title">
<CheckBoxPreference
android:key="pref_key_lock"
android:persistent="false"
android:summary="@string/pref_lock_summary"
android:title="@string/pref_lock_title"
android:enabled="false"/>
<Preference
android:key="pref_key_change_password"
android:title="@string/change_password">