Merge "Updated settings preference title for work profile" into sc-qpr1-dev am: 21ad438f6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15848923 Change-Id: Ib9d449b5e3b4565a6bad54141ccad8491bfb6630
This commit is contained in:
@@ -883,6 +883,9 @@
|
|||||||
<!-- Note: Update FingerprintEnrollParentalConsent.CONSENT_STRING_RESOURCES when any _consent_ strings are added or removed. -->
|
<!-- 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] -->
|
<!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
|
||||||
<string name="security_settings_fingerprint_preference_title">Fingerprint</string>
|
<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] -->
|
<!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
|
||||||
<string name="fingerprint_manage_category_title">Manage fingerprints</string>
|
<string name="fingerprint_manage_category_title">Manage fingerprints</string>
|
||||||
<!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
|
<!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
|
||||||
|
@@ -155,7 +155,7 @@
|
|||||||
|
|
||||||
<com.android.settingslib.RestrictedPreference
|
<com.android.settingslib.RestrictedPreference
|
||||||
android:key="fingerprint_settings_profile"
|
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" />
|
android:summary="@string/summary_placeholder" />
|
||||||
|
|
||||||
<com.android.settingslib.RestrictedPreference
|
<com.android.settingslib.RestrictedPreference
|
||||||
|
Reference in New Issue
Block a user