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

Merge branch '907-panic-signout' into 'master'

Browse Source 
Require a panic app to be set before executing any panic actions

Closes #907

See merge request !492
This commit is contained in:
akwizgran
2017-03-27 09:43:30 +00:00
parent 7161152b41 9cffff715a
commit 2a59515c72
3 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,35 +2,31 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:key="pref_key_panic_app"
android:summary="@string/panic_app_setting_summary"
android:title="@string/panic_app_setting_title"/>
<CheckBoxPreference
android:defaultValue="true"
android:enabled="false"
android:key="pref_key_lock"
android:title="@string/lock_setting_title"
android:summary="@string/lock_setting_summary"
android:defaultValue="true"/>
android:title="@string/lock_setting_title"/>
<PreferenceCategory
android:title="Destructive Actions">
<CheckBoxPreference
android:defaultValue="false"
android:enabled="false"
android:key="pref_key_purge"
android:summary="@string/purge_setting_summary"
android:title="@string/purge_setting_title"/>
<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:defaultValue="false"
android:enabled="false"
android:key="pref_key_uninstall"
android:summary="@string/uninstall_setting_summary"
android:title="@string/uninstall_setting_title"/>
<CheckBoxPreference
android:key="pref_key_purge"
android:title="@string/purge_setting_title"
android:summary="@string/purge_setting_summary"
android:enabled="false"
android:defaultValue="false"/>
<CheckBoxPreference
android:key="pref_key_uninstall"
android:title="@string/uninstall_setting_title"
android:summary="@string/uninstall_setting_summary"
android:enabled="false"
android:defaultValue="false"/>
</PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen>