Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5035f27 authored by Michael Bestas's avatar Michael Bestas
Browse files

Create general lockscreen settings category 

* Owner info, lockscreen shortcuts & visualizer aren't security settings

Change-Id: Ia1c435abb94cc9a23b2f683e96572f21569a7d05
parent e2578693

res/values/cm_strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -1087,6 +1087,7 @@ 
    <string name="expanded_desktop_style_description">Choose a default expanded desktop style</string>

    <string name="expanded_desktop_title">Expanded desktop options</string>



    <string name="title_general">General</string>

    <string name="lockscreen_targets_message">Lock screen shortcuts</string>

    <string name="lockscreen_default_target">Default</string>

    <string name="lockscreen_none_target">None</string>

res/xml/security_settings_biometric_weak.xml

+17 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

                  android:title="@string/security_settings_title">



    <PreferenceCategory
@@ -62,6 +63,11 @@ 
        <SwitchPreference

            android:key="power_button_instantly_locks"

            android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>

    </PreferenceCategory>



    <PreferenceCategory

        android:key="general_category"

        android:title="@string/title_general">



        <PreferenceScreen

            android:key="owner_info_settings"
@@ -69,6 +75,17 @@ 
            android:title="@string/owner_info_settings_title"

            android:summary="@string/owner_info_settings_summary"/>



        <PreferenceScreen

            android:key="lockscreen_shortcuts_settings"

            android:fragment="com.android.settings.cyanogenmod.LockscreenShortcuts"

            android:title="@string/lockscreen_targets_message"

            settings:advanced="true"/>



        <com.android.settings.cyanogenmod.SecureSettingSwitchPreference

            android:key="lockscreen_visualizer"

            android:title="@string/lockscreen_visualizer_title"

            android:defaultValue="true"

            settings:advanced="true"/>

    </PreferenceCategory>



</PreferenceScreen>

res/xml/security_settings_chooser.xml

+13 −9
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ 
            android:title="@string/unlock_set_unlock_launch_picker_title"

            android:summary="@string/unlock_set_unlock_mode_none"

            android:persistent="false"/>

    </PreferenceCategory>



    <PreferenceCategory

        android:key="general_category"

        android:title="@string/title_general">



        <PreferenceScreen

            android:key="owner_info_settings"
@@ -45,7 +50,6 @@ 
            android:title="@string/lockscreen_visualizer_title"

            android:defaultValue="true"

            settings:advanced="true"/>



    </PreferenceCategory>



</PreferenceScreen>

res/xml/security_settings_lockscreen.xml

+10 −4
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ 
            settings:keywords="@string/keywords_lockscreen"

            android:persistent="false"/>



    </PreferenceCategory>



    <PreferenceCategory

        android:key="general_category"

        android:title="@string/title_general">



        <PreferenceScreen

            android:key="owner_info_settings"

            android:fragment="com.android.settings.OwnerInfoSettings"

res/xml/security_settings_password.xml

+20 −16
Original line number Diff line number Diff line
@@ -46,6 +46,18 @@ 
            android:key="power_button_instantly_locks"

            android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>



        <Preference android:key="manage_trust_agents"

                    android:title="@string/manage_trust_agents"

                    android:summary="@string/manage_trust_agents_summary"

                    android:persistent="false"

                    android:fragment="com.android.settings.TrustAgentSettings"

                    settings:advanced="true"/>

    </PreferenceCategory>



    <PreferenceCategory

        android:key="general_category"

        android:title="@string/title_general">



        <PreferenceScreen

            android:key="owner_info_settings"

            android:fragment="com.android.settings.OwnerInfoSettings"
@@ -63,14 +75,6 @@ 
            android:title="@string/lockscreen_visualizer_title"

            android:defaultValue="true"

            settings:advanced="true"/>



        <Preference android:key="manage_trust_agents"

                    android:title="@string/manage_trust_agents"

                    android:summary="@string/manage_trust_agents_summary"

                    android:persistent="false"

                    android:fragment="com.android.settings.TrustAgentSettings"

                    settings:advanced="true"/>



    </PreferenceCategory>



</PreferenceScreen>