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

Merge branch '210-support-panic-kit-purge' into 'master'

Browse Source 
Support for Destructive Panic Actions

This MR is based on and requires !52.

More details are available in the commit message.

All known issues have now been fixed by new upstream releases.

See merge request !54
This commit is contained in:
akwizgran
2016-01-13 15:37:38 +00:00
parent d8c65d0029 63d87ae085
commit 0d2e12e7ff
5 changed files with 330 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
briar-android/res/xml/panic_preferences.xml
View File

@@ -8,4 +8,22 @@
android:summary="@string/lock_setting_summary"
android:defaultValue="true"/>
<PreferenceCategory
android:title="Destructive Actions">
<ListPreference
android:key="pref_key_panic_app"
android:title="@string/panic_app_setting_title"
android:summary="@string/panic_app_setting_summary"
android:icon="@android:drawable/ic_menu_close_clear_cancel"/>
<CheckBoxPreference
android:key="pref_key_purge"
android:title="@string/purge_setting_title"
android:summary="@string/purge_setting_summary"
android:enabled="false"
android:defaultValue="false"/>
</PreferenceCategory>
</PreferenceScreen>