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

This commit is contained in:
TreeHugger Robot
2023-04-06 13:07:13 +00:00
committed by Android (Google) Code Review
3 changed files with 7 additions and 5 deletions

View File

@@ -1199,6 +1199,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]-->

View File

@@ -137,12 +137,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>

View File

@@ -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" />