PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic00eb13b2c51f78b528ddd4da198179047111445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-04-06 13:35:23 +00:00
committed by Automerger Merge Worker
parent 2e82189b1a cb00b2bd0c
commit 33affdae8e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1208,6 +1208,8 @@
<!-- Biometric settings --><skip /> <!-- Biometric settings --><skip />
<!-- Title shown for menu item that launches biometric settings. [CHAR LIMIT=66] --> <!-- Title shown for menu item that launches biometric settings. [CHAR LIMIT=66] -->
<string name="security_settings_biometric_preference_title">Face &amp; Fingerprint Unlock</string> <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] --> <!-- 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> <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]--> <!-- Message shown in summary field of biometric settings when face is enrolled, and multiple fingerprints are enrolled. [CHAR LIMIT=66]-->

4
res/xml/security_advanced_settings.xml
View File

@@ -135,12 +135,12 @@
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="face_settings_profile" 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" /> android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="biometric_settings_profile" 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" /> android:summary="@string/summary_placeholder" />
</PreferenceCategory> </PreferenceCategory>

6
res/xml/security_settings_combined_biometric_profile.xml
View File

@@ -17,7 +17,7 @@
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" 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 <com.android.settingslib.widget.TopIntroPreference
android:title="@string/biometric_settings_intro" /> android:title="@string/biometric_settings_intro" />
@@ -28,14 +28,14 @@
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="biometric_fingerprint_settings_profile" 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" android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_fingerprint_settings" settings:keywords="@string/keywords_fingerprint_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" /> settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="biometric_face_settings_profile" 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" android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_face_settings" settings:keywords="@string/keywords_face_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFaceProfileStatusPreferenceController" /> settings:controller="com.android.settings.biometrics.combination.BiometricFaceProfileStatusPreferenceController" />