user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing files

Browse Source
This commit is contained in:
tom5079
2019-08-29 11:39:01 +09:00
parent 28703e9bf2 5ad2a538bc
commit 9b99baf4bc
13 changed files with 165 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/xml/lock_preferences.xml
View File

@@ -15,7 +15,11 @@
app:key="lock_password"/>
<PreferenceCategory
<<<<<<< HEAD
app:title="@string/settings_lock_biometrics">
=======
app:title="@string/settings_lock_biomatrics">
>>>>>>> origin/development
<Preference
app:title="@string/settings_lock_fingerprint"