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

Commit aeafb020 authored by Marie Matheson's avatar Marie Matheson
Browse files

Move work profile security settings to bottom of list 

Bug: 192540530
Test: atest SettingsUnitTests
Test: make -j80 RunSettingsRoboTests
Test: Tested manually with and without work profile
Change-Id: I29f43202f71388c991948953c3d2c955fd32627e
parent 3bd14d24

res/xml/security_dashboard_settings.xml

+41 −41
Original line number Diff line number Diff line
@@ -62,47 +62,6 @@ 
            settings:keywords="@string/keywords_biometric_settings" />

    </PreferenceCategory>



    <!-- work profile security section -->

    <PreferenceCategory

        android:order="20"

        android:key="security_category_profile"

        android:title="@string/lock_settings_profile_title">



        <!-- security_settings_unification -->

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="unification"

            android:title="@string/lock_settings_profile_unification_title"

            android:summary="@string/lock_settings_profile_unification_summary"

            settings:keywords="@string/keywords_unification" />



        <com.android.settingslib.RestrictedPreference

            android:key="unlock_set_or_change_profile"

            android:title="@string/unlock_set_unlock_launch_picker_title_profile"

            android:summary="@string/unlock_set_unlock_mode_pattern"

            settings:keywords="@string/keywords_lockscreen" />



        <SwitchPreference

            android:key="visiblepattern_profile"

            android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"

            settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />



        <Preference

            android:key="fingerprint_settings_profile"

            android:title="@string/security_settings_fingerprint_preference_title"

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



        <Preference

            android:key="face_settings_profile"

            android:title="@string/security_settings_face_preference_title"

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



        <Preference

            android:key="biometric_settings_profile"

            android:title="@string/security_settings_biometric_preference_title"

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



    </PreferenceCategory>



    <PreferenceCategory

        android:order="40"

        android:key="security_settings_device_admin_category"
@@ -170,4 +129,45 @@ 
        android:summary="@string/confirm_sim_deletion_description"

        settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController"/>



    <!-- work profile security section -->

    <PreferenceCategory

        android:order="100"

        android:key="security_category_profile"

        android:title="@string/lock_settings_profile_title">



        <!-- security_settings_unification -->

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="unification"

            android:title="@string/lock_settings_profile_unification_title"

            android:summary="@string/lock_settings_profile_unification_summary"

            settings:keywords="@string/keywords_unification" />



        <com.android.settingslib.RestrictedPreference

            android:key="unlock_set_or_change_profile"

            android:title="@string/unlock_set_unlock_launch_picker_title_profile"

            android:summary="@string/unlock_set_unlock_mode_pattern"

            settings:keywords="@string/keywords_lockscreen" />



        <SwitchPreference

            android:key="visiblepattern_profile"

            android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"

            settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />



        <Preference

            android:key="fingerprint_settings_profile"

            android:title="@string/security_settings_fingerprint_preference_title"

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



        <Preference

            android:key="face_settings_profile"

            android:title="@string/security_settings_face_preference_title"

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



        <Preference

            android:key="biometric_settings_profile"

            android:title="@string/security_settings_biometric_preference_title"

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



    </PreferenceCategory>



</PreferenceScreen>
 
 No newline at end of file