Merge branch 'master' into 'preference-switches'

# Conflicts:
#   briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java

briar-android/src/main/res/layout/activity_unlock.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	tools:context=".android.login.UnlockActivity">
+
+	<android.support.v7.widget.AppCompatImageView
+		android:id="@+id/image"
+		android:layout_width="150dp"
+		android:layout_height="150dp"
+		android:layout_margin="@dimen/margin_large"
+		android:src="@drawable/splash_screen"
+		app:layout_constraintBottom_toTopOf="@+id/is_locked"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_chainStyle="spread"
+		app:tint="?attr/colorControlNormal"/>
+
+	<TextView
+		android:id="@+id/is_locked"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/margin_large"
+		android:gravity="center"
+		android:text="@string/lock_is_locked"
+		android:textSize="@dimen/text_size_xlarge"
+		app:layout_constraintBottom_toTopOf="@+id/unlock"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/image"
+		app:layout_constraintVertical_chainStyle="spread"/>
+
+	<Button
+		android:id="@+id/unlock"
+		style="@style/BriarButton"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/margin_large"
+		android:text="@string/lock_unlock"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>

briar-android/src/main/res/menu/navigation_drawer.xml

@@ -26,6 +26,11 @@
 			android:id="@+id/nav_btn_settings"
 			android:icon="@drawable/ic_settings_black_24dp"
 			android:title="@string/settings_button"/>
+		<item
+			android:id="@+id/nav_btn_lock"
+			android:icon="@drawable/startup_lock"
+			android:title="@string/lock_button"
+			android:visible="false"/>
 		<item
 			android:id="@+id/nav_btn_signout"
 			android:icon="@drawable/ic_signout"

briar-android/src/main/res/values-ast/strings.xml

@@ -133,7 +133,7 @@
   <string name="security_settings_title">Seguridá</string>
   <string name="panic_setting">Configuración del Botón d\'espantu</string>
   <string name="panic_setting_title">Botón d\'espantu</string>
-  <string name="lock_setting_title">Colar</string>
+  <string name="panic_setting_signout_title">Colar</string>
   <string name="uninstall_setting_title">Desinstalar Briar</string>
   <!--Settings Notifications-->
   <string name="notification_settings_title">Avisos</string>

briar-android/src/main/res/values-bg/strings.xml

@@ -271,8 +271,8 @@
   <string name="panic_app_setting_none">Няма</string>
   <string name="dialog_title_connect_panic_app">Потвърждение на паник приложение</string>
   <string name="dialog_message_connect_panic_app">Сигурни ли сте, че искате да позволите на %1$s да задейства унищожителни действия на паник бутон?</string>
-  <string name="lock_setting_title">Отписване</string>
-  <string name="lock_setting_summary">Отписване от Briar, ако паник бутонът е натиснат</string>
+  <string name="panic_setting_signout_title">Отписване</string>
+  <string name="panic_setting_signout_summary">Отписване от Briar, ако паник бутонът е натиснат</string>
   <string name="purge_setting_title">Изтриване на профил</string>
   <string name="purge_setting_summary">Изтриване на Briar профила, ако паник бутонът е натиснат. Внимание: Изтрива завинаги вашия профил, контакти и съобщения</string>
   <string name="uninstall_setting_title">Деинсталиране на Briar</string>

briar-android/src/main/res/values-br/strings.xml

@@ -164,7 +164,7 @@
   <string name="change_password">Cheñch ar ger-tremen</string>
   <string name="confirm_new_password">Kadarnaat ar ger-tremen nevez</string>
   <string name="panic_app_setting_none">Hini ebet</string>
-  <string name="lock_setting_title">Digevreañ</string>
+  <string name="panic_setting_signout_title">Digevreañ</string>
   <!--Settings Notifications-->
   <string name="notify_sound_setting_disabled">Hini ebet</string>
   <!--Settings Feedback-->

briar-android/src/main/res/values-ca/strings.xml

@@ -343,8 +343,8 @@
   <string name="panic_app_setting_none">Cap</string>
   <string name="dialog_title_connect_panic_app">Confirmeu l\'aplicació de pànic</string>
   <string name="dialog_message_connect_panic_app">Segur que voleu permetre que %1$s desencadeni accions destructives a conseqüència del botó de pànic?</string>
-  <string name="lock_setting_title">Tanca la sessió</string>
-  <string name="lock_setting_summary">Tanca la sessió de Briar si es prem un botó de pànic</string>
+  <string name="panic_setting_signout_title">Tanca la sessió</string>
+  <string name="panic_setting_signout_summary">Tanca la sessió de Briar si es prem un botó de pànic</string>
   <string name="purge_setting_title">Esborreu el compte</string>
   <string name="purge_setting_summary">Suprimeix el compte de Briar si es prem el botó de pànic. Atenció: En aquest cas, s\'eliminarien permanentment les vostres identitats, contactes i missatges</string>
   <string name="uninstall_setting_title">Desinstal·leu Briar</string>

briar-android/src/main/res/values-cs/strings.xml

@@ -346,8 +346,8 @@
   <string name="panic_app_setting_none">Žádný</string>
   <string name="dialog_title_connect_panic_app">Potvrdit aplikaci Paniky</string>
   <string name="dialog_message_connect_panic_app">Jste si jisti, že chcete povolit %1$s spustit akci zneškodnění pomocí tlačítka paniky?</string>
-  <string name="lock_setting_title">Odhlásit se</string>
-  <string name="lock_setting_summary">Odhlásit se z Briar, pokud je stisknuto tlačítko paniky</string>
+  <string name="panic_setting_signout_title">Odhlásit se</string>
+  <string name="panic_setting_signout_summary">Odhlásit se z Briar, pokud je stisknuto tlačítko paniky</string>
   <string name="purge_setting_title">Odstranit účet</string>
   <string name="purge_setting_summary">Vymazat váš Briar účet pokud je stlačeno tlačítko paniky. Upozornění: Toto trvale vymaže vaši identitu, kontakty a zprávy</string>
   <string name="uninstall_setting_title">Odinstalovat Briar</string>

briar-android/src/main/res/values-de/strings.xml

@@ -333,8 +333,8 @@
   <string name="panic_app_setting_none">Keine</string>
   <string name="dialog_title_connect_panic_app">Bestätige Panik-App</string>
   <string name="dialog_message_connect_panic_app">Bist du sicher, dass du %1$s erlauben willst, Panik-Button-Ereignisse auszulösen? Dies kann zum Löschen von Daten führen.</string>
-  <string name="lock_setting_title">Abmelden</string>
-  <string name="lock_setting_summary">Von Briar abmelden, wenn ein Panik-Button aktiviert wird</string>
+  <string name="panic_setting_signout_title">Abmelden</string>
+  <string name="panic_setting_signout_summary">Von Briar abmelden, wenn ein Panik-Button aktiviert wird</string>
   <string name="purge_setting_title">Konto löschen</string>
   <string name="purge_setting_summary">Briar-Konto löschen, wenn der Panik-Button gedrückt wird. Achtung: Es werden alle Identitäten, Kontakte und Nachrichten unwiderruflich gelöscht.</string>
   <string name="uninstall_setting_title">Briar deinstallieren</string>

briar-android/src/main/res/values-es/strings.xml

@@ -327,8 +327,8 @@
   <string name="panic_app_setting_none">Ninguna</string>
   <string name="dialog_title_connect_panic_app">Confirmar aplicación de pánico</string>
   <string name="dialog_message_connect_panic_app">¿Seguro que quieres permitir que %1$s lance acciones destructivas de botón de pánico?</string>
-  <string name="lock_setting_title">Cerrar sesión</string>
-  <string name="lock_setting_summary">Cerrar la sesión de Briar si se pulsa un botón de pánico</string>
+  <string name="panic_setting_signout_title">Cerrar sesión</string>
+  <string name="panic_setting_signout_summary">Cerrar la sesión de Briar si se pulsa un botón de pánico</string>
   <string name="purge_setting_title">Eliminar cuenta</string>
   <string name="purge_setting_summary">Eliminar tu cuenta de Briar si se pulsa un botón de pánico. Advertencia: esto eliminará permanentemente tus identidades, contactos y mensajes</string>
   <string name="uninstall_setting_title">Desinstalar Briar</string>

briar-android/src/main/res/values-eu/strings.xml

@@ -343,8 +343,8 @@
   <string name="panic_app_setting_none">Bat ere ez</string>
   <string name="dialog_title_connect_panic_app">Berretsi larrialdi-aplikazioa</string>
   <string name="dialog_message_connect_panic_app">Ziur %1$s baimendu nahi duzula larrialdi botoiaren ekintza suntsitzaileak burutzea?</string>
-  <string name="lock_setting_title">Amaitu saioa</string>
-  <string name="lock_setting_summary">Amaitu saioa larrialdi botoia zapaltzen bada</string>
+  <string name="panic_setting_signout_title">Amaitu saioa</string>
+  <string name="panic_setting_signout_summary">Amaitu saioa larrialdi botoia zapaltzen bada</string>
   <string name="purge_setting_title">Ezabatu kontua</string>
   <string name="purge_setting_summary">Ezabatu kontua Briar larrialdi botoia zapaltzen bada. Kontuz: Honek behin betiko ezabatuko ditu zure identitateak, kontaktuak eta mezuak</string>
   <string name="uninstall_setting_title">Desinstalatu Briar</string>

briar-android/src/main/res/values-fa/strings.xml

@@ -382,8 +382,8 @@
   <string name="panic_app_setting_none">هیچکدام</string>
   <string name="dialog_title_connect_panic_app">تایید برنامه هراس</string>
   <string name="dialog_message_connect_panic_app">آیا مطمئن هستید که میخواهید به %1$s اجازه دهید تا باعث عملیات مخرب دکمه هراس بشود؟</string>
-  <string name="lock_setting_title">خروج</string>
-  <string name="lock_setting_summary">در صورت کلیک بر روی کلید هراس از برایر خارج شو</string>
+  <string name="panic_setting_signout_title">خروج</string>
+  <string name="panic_setting_signout_summary">در صورت کلیک بر روی کلید هراس از برایر خارج شو</string>
   <string name="purge_setting_title">حذف حساب کاربری</string>
   <string name="purge_setting_summary">پاک کردن حساب کاربری برایر شما در صورتی که دکمه هراس فشار داده شود. اخطار: این باعث پاک شدن دائمی تمام هویت ها، مخاطبان و پیام های شما خواهد شد</string>
   <string name="uninstall_setting_title">پاک کردن برایر</string>

briar-android/src/main/res/values-fi/strings.xml

@@ -343,8 +343,8 @@
   <string name="panic_app_setting_none">Ei mitään</string>
   <string name="dialog_title_connect_panic_app">Vahvista paniikkisovellus</string>
   <string name="dialog_message_connect_panic_app">Oletko varma, että haluat myöntää ohjelmalle %1$s luvan laukaista tuhoa aiheuttavia paniikkinapin toimintoja?</string>
-  <string name="lock_setting_title">Kirjaudu ulos</string>
-  <string name="lock_setting_summary">Kirjaudu ulos Briarista jos paniikkinappia on painettu</string>
+  <string name="panic_setting_signout_title">Kirjaudu ulos</string>
+  <string name="panic_setting_signout_summary">Kirjaudu ulos Briarista jos paniikkinappia on painettu</string>
   <string name="purge_setting_title">Poista tili</string>
   <string name="purge_setting_summary">Poista Briar tilisi jos paniikkinappia on painettu. Varoitus: Tämä tulee pysyvästi poistamaan sinun tunnukset, yhteystiedot ja viestit</string>
   <string name="uninstall_setting_title">Poista Briarin asennus</string>

briar-android/src/main/res/values-fr/strings.xml

@@ -343,8 +343,8 @@
   <string name="panic_app_setting_none">Aucune</string>
   <string name="dialog_title_connect_panic_app">Confirmer l’application d’urgence</string>
   <string name="dialog_message_connect_panic_app">Voulez-vous vraiment autoriser %1$s à déclencher les actions destructrices du bouton d’urgence ?</string>
-  <string name="lock_setting_title">Déconnexion</string>
-  <string name="lock_setting_summary">Se déconnecter de Briar lorsqu’on appuie sur un bouton d’urgence</string>
+  <string name="panic_setting_signout_title">Déconnexion</string>
+  <string name="panic_setting_signout_summary">Se déconnecter de Briar lorsqu’on appuie sur un bouton d’urgence</string>
   <string name="purge_setting_title">Supprimer le compte</string>
   <string name="purge_setting_summary">Supprimer votre compte Briar lorsqu’on appuie sur un bouton d’urgence. Attention : cela supprimera définitivement vos identités, contacts et messages</string>
   <string name="uninstall_setting_title">Désinstaller Briar</string>

briar-android/src/main/res/values-gl/strings.xml

@@ -341,8 +341,8 @@
   <string name="panic_app_setting_none">Ningún</string>
   <string name="dialog_title_connect_panic_app">Confirme a App do pánico</string>
   <string name="dialog_message_connect_panic_app">Está segura de querer permitir a %1$s activar accións destrutivas do botón do pánico?</string>
-  <string name="lock_setting_title">Finalizar sesión</string>
-  <string name="lock_setting_summary">Desconecte de Briar si o botón do pánico se preme</string>
+  <string name="panic_setting_signout_title">Finalizar sesión</string>
+  <string name="panic_setting_signout_summary">Desconecte de Briar si o botón do pánico se preme</string>
   <string name="purge_setting_title">Eliminar conta</string>
   <string name="purge_setting_summary">Elimina a súa conta en Briar si se preme o botón do pánico. Coidado: Esto eliminará permanentemente as súas identidade, contactos e mensaxes</string>
   <string name="uninstall_setting_title">Desinstalar Briar</string>

briar-android/src/main/res/values-he/strings.xml

@@ -239,7 +239,7 @@
   <string name="security_settings_title">אבטחה</string>
   <string name="choose_new_password">סיסמא חדשה</string>
   <string name="panic_app_setting_none">כלום</string>
-  <string name="lock_setting_title">יציאה</string>
+  <string name="panic_setting_signout_title">יציאה</string>
   <string name="purge_setting_title">מחק חשבון</string>
   <!--Settings Notifications-->
   <string name="notification_settings_title">הודעות מערכת</string>

briar-android/src/main/res/values-hi/strings.xml

@@ -327,8 +327,8 @@
   <string name="panic_app_setting_none">कुछ भी नहीं</string>
   <string name="dialog_title_connect_panic_app">आतंक ऐप की पुष्टि करें</string>
   <string name="dialog_message_connect_panic_app">क्या आप निश्चित हैं कि आप%1$s को विनाशकारी आतंक बटन क्रियाओं को ट्रिगर करने की अनुमति देना चाहते हैं?</string>
-  <string name="lock_setting_title">साइन आउट</string>
-  <string name="lock_setting_summary">यदि कोई आतंक बटन दबाया जाता है तो बियर से साइन आउट करें</string>
+  <string name="panic_setting_signout_title">साइन आउट</string>
+  <string name="panic_setting_signout_summary">यदि कोई आतंक बटन दबाया जाता है तो बियर से साइन आउट करें</string>
   <string name="purge_setting_title">खाता हटा दो</string>
   <string name="purge_setting_summary">यदि आपका आतंक बटन दबाया गया हो तो अपने ब्रियर खाते को हटा दें। सावधानी: यह आपकी पहचान, संपर्क और संदेश को स्थायी रूप से हटा देगा</string>
   <string name="uninstall_setting_title">बरिअर की स्थापना रद्द करें</string>

briar-android/src/main/res/values-it/strings.xml

@@ -343,8 +343,8 @@
   <string name="panic_app_setting_none">Nessuno</string>
   <string name="dialog_title_connect_panic_app">Conferma App Panico</string>
   <string name="dialog_message_connect_panic_app">Sei sicuro di voler consentire %1$s di attivare le azioni distruttive del pulsante panico?</string>
-  <string name="lock_setting_title">Esci</string>
-  <string name="lock_setting_summary">Uscire da Briar se viene premuto un pulsante di panico</string>
+  <string name="panic_setting_signout_title">Esci</string>
+  <string name="panic_setting_signout_summary">Uscire da Briar se viene premuto un pulsante di panico</string>
   <string name="purge_setting_title">Elimina Account</string>
   <string name="purge_setting_summary">Cancella il tuo account Briar se un panic button è premuto. Attenzione: ciò cancellerà permanentemente le tue identità, contatti e messaggi</string>
   <string name="uninstall_setting_title">Disinstalla Briar</string>

briar-android/src/main/res/values-ja/strings.xml

@@ -114,7 +114,7 @@
   <string name="change_password">パスワードの変更</string>
   <string name="confirm_new_password">新しいパスワードの確認</string>
   <string name="panic_app_setting_none">なし</string>
-  <string name="lock_setting_title">サインアウト</string>
+  <string name="panic_setting_signout_title">サインアウト</string>
   <string name="purge_setting_title">アカウントを削除</string>
   <!--Settings Notifications-->
   <string name="notification_settings_title">通知</string>

briar-android/src/main/res/values-nb/strings.xml

@@ -296,8 +296,8 @@
   <string name="panic_app_setting_none">Inget</string>
   <string name="dialog_title_connect_panic_app">Bekreft panikk-knapp-program</string>
   <string name="dialog_message_connect_panic_app">Er du sikker på at du vil tillate %1$s å utløse destruktive panikk-knapp-handlinger?</string>
-  <string name="lock_setting_title">Logg ut</string>
-  <string name="lock_setting_summary">Logg ut av Briar hvis panikk-knappen trykkes</string>
+  <string name="panic_setting_signout_title">Logg ut</string>
+  <string name="panic_setting_signout_summary">Logg ut av Briar hvis panikk-knappen trykkes</string>
   <string name="purge_setting_title">Slett konto</string>
   <string name="purge_setting_summary">Slett Briar-kontoen din hvis panikk-knappen trykkes. Advarsel: Dette vil slette dine identiteter, kontakter og meldinger for godt.</string>
   <string name="uninstall_setting_title">Avinstaller Briar</string>

briar-android/src/main/res/values-nl/strings.xml

@@ -343,8 +343,8 @@
   <string name="panic_app_setting_none">Geen</string>
   <string name="dialog_title_connect_panic_app">Bevestig paniekapp</string>
   <string name="dialog_message_connect_panic_app">Weet je zeker dat je wil toestaan dat %1$s destructieve paniekknopacties mag veroorzaken?</string>
-  <string name="lock_setting_title">Log uit</string>
-  <string name="lock_setting_summary">Log uit op Briar als de paniekknop wordt ingedrukt.</string>
+  <string name="panic_setting_signout_title">Log uit</string>
+  <string name="panic_setting_signout_summary">Log uit op Briar als de paniekknop wordt ingedrukt.</string>
   <string name="purge_setting_title">Verwijder account</string>
   <string name="purge_setting_summary">Verwijder je Briar-account als een paniekknop wordt ingedrukt. Let op: Dit zal permanent je identiteit, contacten en berichten verwijderen.</string>
   <string name="uninstall_setting_title">Deïnstalleer Briar</string>

briar-android/src/main/res/values-oc/strings.xml

@@ -309,8 +309,8 @@ Volètz suprimir vòstre compte e ne crear un nòu ?\n
   <string name="panic_app_setting_none">Cap</string>
   <string name="dialog_title_connect_panic_app">Confirmar l’aplicacion Urgéncia</string>
   <string name="dialog_message_connect_panic_app">Sètz segur de voler autorizar %1$s a aviar las accions de destruccion del boton Urgéncia ?</string>
-  <string name="lock_setting_title">Se desconnectar</string>
-  <string name="lock_setting_summary">Se desconnectar de Briar en apiejant lo boton Urgéncia ?</string>
+  <string name="panic_setting_signout_title">Se desconnectar</string>
+  <string name="panic_setting_signout_summary">Se desconnectar de Briar en apiejant lo boton Urgéncia ?</string>
   <string name="purge_setting_title">Suprimir lo compte</string>
   <string name="purge_setting_summary">Suprimir vòstre compte en apiejant lo boton Urgéncia. Mèfi, aquò escafarà per totjorn vòstra identitat, vòstres contactes e messatges.</string>
   <string name="uninstall_setting_title">Desinstallar Briar</string>

briar-android/src/main/res/values-pl/strings.xml

@@ -361,8 +361,8 @@
   <string name="panic_app_setting_none">Brak</string>
   <string name="dialog_title_connect_panic_app">Potwierdź Awaryjną Aplikację</string>
   <string name="dialog_message_connect_panic_app">Czy na pewno chcesz pozwolić %1$s aby działała jako przycisk wyjścia awaryjnego?</string>
-  <string name="lock_setting_title">Wyloguj się</string>
-  <string name="lock_setting_summary">Wyloguj się z Briar jeśli przycisk zostanie wciśnięty</string>
+  <string name="panic_setting_signout_title">Wyloguj się</string>
+  <string name="panic_setting_signout_summary">Wyloguj się z Briar jeśli przycisk zostanie wciśnięty</string>
   <string name="purge_setting_title">Skasuj Konto</string>
   <string name="purge_setting_summary">Skasuj Twoje konto Briar jeśli przycisk wyjścia awaryjnego zostanie wciśnięty. Ostrzeżenie: Ta akcja usunie permanentnie Twoje konto, kontakty i wiadomości</string>
   <string name="uninstall_setting_title">Odinstaluj Briar</string>

briar-android/src/main/res/values-pt-rBR/strings.xml

@@ -332,8 +332,8 @@
   <string name="panic_app_setting_none">Nenhum</string>
   <string name="dialog_title_connect_panic_app">Confirmar aplicativo de pânico</string>
   <string name="dialog_message_connect_panic_app">Você tem certeza que quer permitir que %1$s ative ações destrutivas do botão de pânico?</string>
-  <string name="lock_setting_title">Desconectar</string>
-  <string name="lock_setting_summary">Desconectar do Briar se o botão de pânico for apertado</string>
+  <string name="panic_setting_signout_title">Desconectar</string>
+  <string name="panic_setting_signout_summary">Desconectar do Briar se o botão de pânico for apertado</string>
   <string name="purge_setting_title">Apagar conta</string>
   <string name="purge_setting_summary">Apagar sua conta do Briar se o botão de pânico for apertado. Atenção: isso irá apagar permanentemente suas identidades, contatos e mensagens</string>
   <string name="uninstall_setting_title">Desinstalar o Briar</string>

briar-android/src/main/res/values-ro/strings.xml

@@ -354,8 +354,8 @@
   <string name="panic_app_setting_none">Nici una</string>
   <string name="dialog_title_connect_panic_app">Confirmare aplicație de panică</string>
   <string name="dialog_message_connect_panic_app">Sigur doriți să permiteți %1$s să declanșeze acțiuni destructive pentru butonul de panică?</string>
-  <string name="lock_setting_title">Ieșire</string>
-  <string name="lock_setting_summary">Ieși din Briar dacă un buton de panică este apăsat</string>
+  <string name="panic_setting_signout_title">Ieșire</string>
+  <string name="panic_setting_signout_summary">Ieși din Briar dacă un buton de panică este apăsat</string>
   <string name="purge_setting_title">Șterge cont</string>
   <string name="purge_setting_summary">Ștergeți contul Briar dacă este apăsat buton de panică. Atenție: aceasta va șterge definitiv identitatea, contactele și mesajele dvs.</string>
   <string name="uninstall_setting_title">Dezinstalare Briar</string>

briar-android/src/main/res/values-ru/strings.xml

@@ -363,8 +363,8 @@
   <string name="panic_app_setting_none">Нет</string>
   <string name="dialog_title_connect_panic_app">Подтвердить приложение тревожной кнопки</string>
   <string name="dialog_message_connect_panic_app">Вы уверены, что хотите разрешить %1$s запускать действия тревожной кнопки?</string>
-  <string name="lock_setting_title">Выйти</string>
-  <string name="lock_setting_summary">Выйти из Briar, если нажата тревожная кнопка</string>
+  <string name="panic_setting_signout_title">Выйти</string>
+  <string name="panic_setting_signout_summary">Выйти из Briar, если нажата тревожная кнопка</string>
   <string name="purge_setting_title">Удалить аккаунт</string>
   <string name="purge_setting_summary">Удалить вашу учетную запись Briar при нажатии тревожной кнопки. Внимание: это необратимо удалит ваши идентификаторы, контакты и сообщения</string>
   <string name="uninstall_setting_title">Удалить Briar</string>

briar-android/src/main/res/values-sq/strings.xml

@@ -343,8 +343,8 @@
   <string name="panic_app_setting_none">Asnjë</string>
   <string name="dialog_title_connect_panic_app">Ripohoni Aplikacion Paniku</string>
   <string name="dialog_message_connect_panic_app">Jeni i sigurt se doni të lejohet %1$s të prodhojë veprime shkatërruese butoni paniku?</string>
-  <string name="lock_setting_title">Dilni</string>
-  <string name="lock_setting_summary">Dil nga Briar-i nëse shtypet një buton paniku</string>
+  <string name="panic_setting_signout_title">Dilni</string>
+  <string name="panic_setting_signout_summary">Dil nga Briar-i nëse shtypet një buton paniku</string>
   <string name="purge_setting_title">Fshi Llogarinë</string>
   <string name="purge_setting_summary">Fshijeni llogarinë tuaj Briar, nëse shtypet një buton paniku. Kujdes: Kjo do të shkaktojë fshirjen e identiteteve, kontakteve dhe mesazheve tuaj</string>
   <string name="uninstall_setting_title">Çinstalo Briar-in</string>

briar-android/src/main/res/values-sr/strings.xml

@@ -237,8 +237,8 @@
   <string name="panic_app_setting_none">Ništa</string>
   <string name="dialog_title_connect_panic_app">Potvrdi Panic App</string>
   <string name="dialog_message_connect_panic_app">Jeste li sigurni da želite da dozvolite %1$s da pokrene destruktivne akcije panik dugmeta?</string>
-  <string name="lock_setting_title">Izlogujte se</string>
-  <string name="lock_setting_summary">Izloguj se iz Briar-a ako je pritisnuto panik dugme</string>
+  <string name="panic_setting_signout_title">Izlogujte se</string>
+  <string name="panic_setting_signout_summary">Izloguj se iz Briar-a ako je pritisnuto panik dugme</string>
   <string name="purge_setting_title">Izbriši račun</string>
   <string name="purge_setting_summary">Izbriši Briar račun ako je panik dugme pritisnuto. Pažnja: Ovo će permanentno izbrisati vaše identitete, kontakte i poruke</string>
   <string name="uninstall_setting_title">Deinstaliraj Briar</string>

briar-android/src/main/res/values-sv/strings.xml

@@ -129,8 +129,8 @@
   <string name="choose_new_password">Nytt lösenord</string>
   <string name="confirm_new_password">Bekräfta nytt lösenord</string>
   <string name="panic_app_setting_none">Ingen</string>
-  <string name="lock_setting_title">Logga ut</string>
-  <string name="lock_setting_summary">Logga ut från Briar om panikknappen tryckts</string>
+  <string name="panic_setting_signout_title">Logga ut</string>
+  <string name="panic_setting_signout_summary">Logga ut från Briar om panikknappen tryckts</string>
   <string name="purge_setting_title">Radera kontot</string>
   <string name="uninstall_setting_title">Avinstallera Briar</string>
   <!--Settings Notifications-->

briar-android/src/main/res/values-tr/strings.xml

@@ -264,8 +264,8 @@
   <string name="panic_app_setting_none">Yok</string>
   <string name="dialog_title_connect_panic_app">Panik Uygulaması Doğrulama</string>
   <string name="dialog_message_connect_panic_app">%1$s kişisinin yıkıcı panik düğmesi eylemlerini tetiklemesine izin vermek istediğinizden emin misiniz?</string>
-  <string name="lock_setting_title">Çıkış Yap</string>
-  <string name="lock_setting_summary">Panik Butonuna basıldığında Briar\'dan çıkış yap</string>
+  <string name="panic_setting_signout_title">Çıkış Yap</string>
+  <string name="panic_setting_signout_summary">Panik Butonuna basıldığında Briar\'dan çıkış yap</string>
   <string name="purge_setting_title">Hesabı Sil</string>
   <string name="purge_setting_summary">Bir panik düğmesine basıldığında Briar hesabınızı silin. Dikkat: Bu, kimliklerinizi, kayıtlarınızı ve iletilerinizi kalıcı olarak silecektir.</string>
   <string name="uninstall_setting_title">Briar\'ı Kaldır</string>

briar-android/src/main/res/values-zh-rCN/strings.xml

@@ -333,8 +333,8 @@
   <string name="panic_app_setting_none">无</string>
   <string name="dialog_title_connect_panic_app">确认应急应用</string>
   <string name="dialog_message_connect_panic_app">是否允许 %1$s 触发破坏性应急开关反应？</string>
-  <string name="lock_setting_title">登出</string>
-  <string name="lock_setting_summary">触发应急开关时登出 Briar</string>
+  <string name="panic_setting_signout_title">登出</string>
+  <string name="panic_setting_signout_summary">触发应急开关时登出 Briar</string>
   <string name="purge_setting_title">删除账号</string>
   <string name="purge_setting_summary">触发应急开关时删除您的账号。注意：您的身份、联系人和消息将会永久遗失。</string>
   <string name="uninstall_setting_title">卸载 Briar</string>

briar-android/src/main/res/values/strings.xml

@@ -62,6 +62,7 @@
 	<string name="groups_button">Private Groups</string>
 	<string name="forums_button">Forums</string>
 	<string name="blogs_button">Blogs</string>
+	<string name="lock_button">Lock App</string>
 	<string name="settings_button">Settings</string>
 	<string name="sign_out_button">Sign Out</string>
 
@@ -356,6 +357,9 @@
 
 	<!-- Settings Security and Panic -->
 	<string name="security_settings_title">Security</string>
+	<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="change_password">Change password</string>
 	<string name="current_password">Current password</string>
 	<string name="choose_new_password">New password</string>
@@ -370,8 +374,8 @@
 	<string name="panic_app_setting_none">None</string>
 	<string name="dialog_title_connect_panic_app">Confirm Panic App</string>
 	<string name="dialog_message_connect_panic_app">Are you sure that you want to allow %1$s to trigger destructive panic button actions?</string>
-	<string name="lock_setting_title">Sign Out</string>
-	<string name="lock_setting_summary">Sign out of Briar if a panic button is pressed</string>
+	<string name="panic_setting_signout_title">Sign Out</string>
+	<string name="panic_setting_signout_summary">Sign out of Briar if a panic button is pressed</string>
 	<string name="purge_setting_title">Delete Account</string>
 	<string name="purge_setting_summary">Delete your Briar account if a panic button is pressed. Caution: This will permanently delete your identities, contacts and messages</string>
 	<string name="uninstall_setting_title">Uninstall Briar</string>
@@ -444,4 +448,11 @@
 	<string name="permission_camera_denied_toast">Camera permission was not granted</string>
 	<string name="qr_code">QR code</string>
 	<string name="show_qr_code_fullscreen">Show QR code fullscreen</string>
+
+	<!-- App Locking -->
+	<string name="lock_unlock">Unlock Briar</string>
+	<string name="lock_unlock_verbose">Enter your device PIN, pattern or password to unlock Briar</string>
+	<string name="lock_is_locked">Briar is locked</string>
+	<string name="lock_tap_to_unlock">Tap to unlock</string>
+
 </resources>

briar-android/src/main/res/xml/panic_preferences.xml

@@ -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"

briar-android/src/main/res/xml/settings.xml

@@ -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">