Merge "Updated settings preference title for work profile" into sc-qpr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
21ad438f6a
@@ -883,6 +883,9 @@
|
||||
<!-- Note: Update FingerprintEnrollParentalConsent.CONSENT_STRING_RESOURCES when any _consent_ strings are added or removed. -->
|
||||
<!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
|
||||
<string name="security_settings_fingerprint_preference_title">Fingerprint</string>
|
||||
<!-- Fingerprint enrollment and settings --><skip />
|
||||
<!-- Title shown for work menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
|
||||
<string name="security_settings_work_fingerprint_preference_title">Fingerprint for work</string>
|
||||
<!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
|
||||
<string name="fingerprint_manage_category_title">Manage fingerprints</string>
|
||||
<!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
|
||||
|
@@ -155,7 +155,7 @@
|
||||
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
android:key="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" />
|
||||
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
|
Reference in New Issue
Block a user