Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 03:39:05 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1247-pin-lock' into 'master'

Browse Source 
Screen Lock Feature

See merge request briar/briar!870
This commit is contained in:
akwizgran
2018-08-14 09:28:04 +00:00
parent 4f18303a1f 64e30844b8
commit 42031631dd
52 changed files with 632 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/main/AndroidManifest.xml
View File

@@ -402,5 +402,11 @@
android:theme="@android:style/Theme.NoDisplay">
</activity>
<activity
android:name=".android.login.UnlockActivity"
android:label="@string/lock_unlock"
android:launchMode="singleTask"
android:theme="@style/BriarTheme.NoActionBar"/>
</application>
</manifest>