Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use RestrictedPreference for all biometric settings." into sc-dev

Browse Source
This commit is contained in:
Joe Bolinger
2021-07-27 17:25:25 +00:00
committed by Android (Google) Code Review
parent 1c95bda96f 61d998406d
commit 7e9077fd14
9 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/security_dashboard_settings.xml
View File

@@ -153,17 +153,17 @@
android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
<Preference
<com.android.settingslib.RestrictedPreference
android:key="fingerprint_settings_profile"
android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder" />
<Preference
<com.android.settingslib.RestrictedPreference
android:key="face_settings_profile"
android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder" />
<Preference
<com.android.settingslib.RestrictedPreference
android:key="biometric_settings_profile"
android:title="@string/security_settings_biometric_preference_title"
android:summary="@string/summary_placeholder" />

4
res/xml/security_settings_combined_biometric.xml
View File

@@ -26,14 +26,14 @@
android:key="biometric_ways_to_unlock"
android:title="@string/biometric_settings_category_ways_to_unlock">
<Preference
<com.android.settingslib.RestrictedPreference
android:key="biometric_face_settings"
android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_face_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFaceStatusPreferenceController" />
<Preference
<com.android.settingslib.RestrictedPreference
android:key="biometric_fingerprint_settings"
android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder"

4
res/xml/security_settings_combined_biometric_profile.xml
View File

@@ -26,14 +26,14 @@
android:key="biometric_ways_to_unlock"
android:title="@string/biometric_settings_category_ways_to_unlock">
<Preference
<com.android.settingslib.RestrictedPreference
android:key="biometric_fingerprint_settings_profile"
android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder"
settings:keywords="@string/keywords_fingerprint_settings"
settings:controller="com.android.settings.biometrics.combination.BiometricFingerprintProfileStatusPreferenceController" />
<Preference
<com.android.settingslib.RestrictedPreference
android:key="biometric_face_settings_profile"
android:title="@string/security_settings_face_preference_title"
android:summary="@string/summary_placeholder"