Merge "Remove the face unlock category" into sc-dev am: 3af33cd3fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732241

Change-Id: I3f0808a55fc768c4605e6b311d5c65217e394833
This commit is contained in:
TreeHugger Robot
2021-06-02 08:23:33 +00:00
committed by Automerger Merge Worker

View File

@@ -70,9 +70,6 @@
settings:controller="com.android.settings.biometrics.face.FaceSettingsLockscreenBypassPreferenceController" /> settings:controller="com.android.settings.biometrics.face.FaceSettingsLockscreenBypassPreferenceController" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory
android:key="security_settings_face_button_category"
android:title="@string/security_settings_face_preference_title">
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.LayoutPreference
android:key="security_settings_face_delete_faces_container" android:key="security_settings_face_delete_faces_container"
android:title="@string/security_settings_face_settings_remove_face_model" android:title="@string/security_settings_face_settings_remove_face_model"
@@ -84,7 +81,6 @@
android:title="@string/security_settings_face_settings_enroll" android:title="@string/security_settings_face_settings_enroll"
android:selectable="false" android:selectable="false"
android:layout="@layout/face_enroll_button"/> android:layout="@layout/face_enroll_button"/>
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference <com.android.settingslib.widget.FooterPreference
android:key="security_face_footer" android:key="security_face_footer"