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

Commit e37fca66 authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix the wording order of personal and work are different in the device... 

Merge "Fix the wording order of personal and work are different in the device unlock settings" into main
parents 3e365cdc f0bd2d38

res/xml/security_advanced_settings.xml

+4 −4
Original line number Diff line number Diff line
@@ -140,13 +140,13 @@ 
            settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />



        <com.android.settingslib.RestrictedPreference

            android:key="fingerprint_settings_profile"

            android:title="@string/security_settings_work_fingerprint_preference_title"

            android:key="face_settings_profile"

            android:title="@string/security_settings_face_profile_preference_title"

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



        <com.android.settingslib.RestrictedPreference

            android:key="face_settings_profile"

            android:title="@string/security_settings_face_profile_preference_title"

            android:key="fingerprint_settings_profile"

            android:title="@string/security_settings_work_fingerprint_preference_title"

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



        <com.android.settingslib.RestrictedPreference

res/xml/security_settings_combined_biometric_profile.xml

+7 −7
Original line number Diff line number Diff line
@@ -26,13 +26,6 @@ 
        android:key="biometric_ways_to_unlock"

        android:title="@string/biometric_settings_category_ways_to_unlock">



        <com.android.settingslib.RestrictedPreference

            android:key="biometric_fingerprint_settings_profile"

            android:title="@string/security_settings_work_fingerprint_preference_title"

            android:summary="@string/summary_placeholder"

            settings:keywords="@string/keywords_fingerprint_settings"

            settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />



        <com.android.settingslib.RestrictedPreference

            android:key="biometric_face_settings_profile"

            android:title="@string/security_settings_face_profile_preference_title"
@@ -40,6 +33,13 @@ 
            settings:keywords="@string/keywords_face_settings"

            settings:controller="com.android.settings.biometrics.combination.BiometricFaceProfileStatusPreferenceController" />



        <com.android.settingslib.RestrictedPreference

            android:key="biometric_fingerprint_settings_profile"

            android:title="@string/security_settings_work_fingerprint_preference_title"

            android:summary="@string/summary_placeholder"

            settings:keywords="@string/keywords_fingerprint_settings"

            settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />



    </PreferenceCategory>



    <PreferenceCategory