Merge "Remove the face unlock category" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-06-02 07:59:42 +00:00
committed by Android (Google) Code Review

View File

@@ -70,21 +70,17 @@
settings:controller="com.android.settings.biometrics.face.FaceSettingsLockscreenBypassPreferenceController" /> settings:controller="com.android.settings.biometrics.face.FaceSettingsLockscreenBypassPreferenceController" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <com.android.settingslib.widget.LayoutPreference
android:key="security_settings_face_button_category" android:key="security_settings_face_delete_faces_container"
android:title="@string/security_settings_face_preference_title"> android:title="@string/security_settings_face_settings_remove_face_model"
<com.android.settingslib.widget.LayoutPreference android:selectable="false"
android:key="security_settings_face_delete_faces_container" android:layout="@layout/face_remove_button"/>
android:title="@string/security_settings_face_settings_remove_face_model"
android:selectable="false"
android:layout="@layout/face_remove_button"/>
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.LayoutPreference
android:key="security_settings_face_enroll_faces_container" android:key="security_settings_face_enroll_faces_container"
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"