Merge "Revert "Remove attention controller"" into qt-qpr1-dev

am: 1876b8c6dd

Change-Id: I5282deec73015da2920c0b429e1e23c5f97d4fbe
This commit is contained in:
Kevin Chyn
2019-11-01 10:06:20 -07:00
committed by android-build-merger
2 changed files with 16 additions and 2 deletions

View File

@@ -51,6 +51,13 @@
<PreferenceCategory
android:key="security_settings_face_manage_category"
android:title="@string/security_settings_face_settings_require_category">
<SwitchPreference
android:key="security_settings_face_require_attention"
android:title="@string/security_settings_face_settings_require_attention"
android:summary="@string/security_settings_face_settings_require_attention_details"
app:keywords="@string/keywords_face_unlock"
app:controller="com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController"/>
<SwitchPreference
android:key="security_settings_face_require_confirmation"
android:title="@string/security_settings_face_settings_require_confirmation"