Merge "Added horizontal seperator in Face Settings" into qt-qpr1-dev am: 30bf9e2e5e

Change-Id: Iacdac6e3fc2f8ba03f5cd3a590f52c5c990e1226
This commit is contained in:
Automerger Merge Worker
2019-12-18 06:27:02 +00:00

View File

@@ -64,7 +64,11 @@
android:summary="@string/security_settings_face_settings_require_confirmation_details" android:summary="@string/security_settings_face_settings_require_confirmation_details"
app:keywords="@string/keywords_face_unlock" app:keywords="@string/keywords_face_unlock"
app:controller="com.android.settings.biometrics.face.FaceSettingsConfirmPreferenceController"/> app:controller="com.android.settings.biometrics.face.FaceSettingsConfirmPreferenceController"/>
</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:selectable="false" android:selectable="false"
@@ -73,7 +77,7 @@
<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:selectable="false" android:selectable="false"
android:layout="@layout/face_enroll_button " /> android:layout="@layout/face_enroll_button" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory