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

Commit 33affdae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add "for work" in work profile biometrics string" into tm-qpr-dev am: cb00b2bd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22478282



Change-Id: Ic00eb13b2c51f78b528ddd4da198179047111445
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e82189b cb00b2bd

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1208,6 +1208,8 @@ 
    <!-- Biometric settings --><skip />

    <!-- Title shown for menu item that launches biometric settings. [CHAR LIMIT=66] -->

    <string name="security_settings_biometric_preference_title">Face &amp; Fingerprint Unlock</string>

    <!-- Title shown for work menu item that launches biometric settings. [CHAR LIMIT=66] -->

    <string name="security_settings_work_biometric_preference_title">Face &amp; Fingerprint Unlock for work</string>

    <!-- Message shown in summary field of biometric settings. [CHAR LIMIT=66] -->

    <string name="security_settings_biometric_preference_summary_none_enrolled">Tap to set up</string>

    <!-- Message shown in summary field of biometric settings when face is enrolled, and multiple fingerprints are enrolled. [CHAR LIMIT=66]-->

res/xml/security_advanced_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -135,12 +135,12 @@ 


        <com.android.settingslib.RestrictedPreference

            android:key="face_settings_profile"

            android:title="@string/security_settings_face_preference_title"

            android:title="@string/security_settings_face_profile_preference_title"

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



        <com.android.settingslib.RestrictedPreference

            android:key="biometric_settings_profile"

            android:title="@string/security_settings_biometric_preference_title"

            android:title="@string/security_settings_work_biometric_preference_title"

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



    </PreferenceCategory>

res/xml/security_settings_combined_biometric_profile.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<PreferenceScreen

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

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

    android:title="@string/security_settings_biometric_preference_title">

    android:title="@string/security_settings_work_biometric_preference_title">



    <com.android.settingslib.widget.TopIntroPreference

        android:title="@string/biometric_settings_intro" />
@@ -28,14 +28,14 @@ 


        <com.android.settingslib.RestrictedPreference

            android:key="biometric_fingerprint_settings_profile"

            android:title="@string/security_settings_fingerprint_preference_title"

            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_preference_title"

            android:title="@string/security_settings_face_profile_preference_title"

            android:summary="@string/summary_placeholder"

            settings:keywords="@string/keywords_face_settings"

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