Merge "[Biometric Onboarding & Edu] Update face settings page" into main
This commit is contained in:
@@ -19,6 +19,11 @@
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:title="@string/security_settings_face_preference_title">
|
||||
|
||||
<com.android.settingslib.widget.TopIntroPreference
|
||||
android:key="security_settings_face_description"
|
||||
settings:searchable="false"
|
||||
settings:isPreferenceVisible="false" />
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="biometric_settings_use_face_to"
|
||||
android:title="@string/security_settings_face_settings_use_face_to_category"
|
||||
@@ -37,6 +42,18 @@
|
||||
settings:controller="com.android.settings.biometrics.face.FaceSettingsAppsPreferenceController"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="security_settings_face_enrolled_category"
|
||||
android:title="@string/security_settings_face_preference_title_new"
|
||||
settings:isPreferenceVisible="false">
|
||||
<com.android.settings.biometrics.face.FacePreference
|
||||
android:key="security_settings_face_remove"
|
||||
android:title="@string/security_settings_face_preference_title_new"/>
|
||||
<Preference
|
||||
android:key="security_settings_face_enroll"
|
||||
android:title="@string/security_settings_face_add"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="security_settings_face_unlock_category"
|
||||
android:title="@string/security_settings_face_settings_use_face_category"
|
||||
@@ -88,13 +105,15 @@
|
||||
android:key="security_settings_face_delete_faces_container"
|
||||
android:title="@string/security_settings_face_settings_remove_face_model"
|
||||
android:selectable="false"
|
||||
android:layout="@layout/face_remove_button"/>
|
||||
android:layout="@layout/face_remove_button"
|
||||
settings:isPreferenceVisible="false"/>
|
||||
|
||||
<com.android.settingslib.widget.LayoutPreference
|
||||
android:key="security_settings_face_enroll_faces_container"
|
||||
android:title="@string/security_settings_face_settings_enroll"
|
||||
android:selectable="false"
|
||||
android:layout="@layout/face_enroll_button"/>
|
||||
android:layout="@layout/face_enroll_button"
|
||||
settings:isPreferenceVisible="false"/>
|
||||
|
||||
<com.android.settingslib.widget.FooterPreference
|
||||
android:key="security_face_footer"
|
||||
|
Reference in New Issue
Block a user