Added missing files

2019-08-29 11:39:01 +09:00
parent 28703e9bf2 5ad2a538bc
commit 9b99baf4bc
13 changed files with 165 additions and 34 deletions
--- a/app/src/main/res/xml/lock_preferences.xml
+++ b/app/src/main/res/xml/lock_preferences.xml
@@ -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"
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -69,11 +69,14 @@
            app:title="@string/settings_dark_mode_title"
            app:summary="@string/settings_dark_mode_summary"/>

+<<<<<<< HEAD
        <SwitchPreference
            app:key="nomedia"
            app:title="@string/settings_nomedia_title"
            app:summary="@string/settings_nomedia_title"/>

+=======
+>>>>>>> origin/development
    </PreferenceCategory>

 </androidx.preference.PreferenceScreen>