Remove "Screen lock" category header as the title is sufficient.

Bug: 5203189

Insert a descriptive text as a header view when in weak biometric
fallback case.

Change-Id: Ic10cc7d276975b13c188bd15016fea2200ec0e5b

2 files changed, 30 insertions, 19 deletions

diff --git a/res/layout/weak_biometric_fallback_header.xml b/res/layout/weak_biometric_fallback_header.xml
new file mode 100644
index 0000000..adbb613
--- /dev/null
+++ b/res/layout/weak_biometric_fallback_header.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dip"
+        android:gravity="center"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:attr/textColorSecondary"
+        android:text="@string/unlock_backup_info_summary"
+/>
\ No newline at end of file
diff --git a/res/xml/security_settings_picker.xml b/res/xml/security_settings_picker.xml
index 2d0760c..87e69e0 100644
--- a/res/xml/security_settings_picker.xml
+++ b/res/xml/security_settings_picker.xml
@@ -16,53 +16,40 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-     <PreferenceCategory
-        android:key="security_picker_category"
-        android:title="@string/lock_settings_picker_title">
-
-<!-- TODO: find a better way to display this backup info -->
-        <PreferenceScreen
-            android:key="unlock_backup_info"
-            android:summary="@string/unlock_backup_info_summary"
-            android:selectable="false"
-            android:persistent="false"/>
-
-        <PreferenceScreen
+    <PreferenceScreen
             android:key="unlock_set_off"
             android:title="@string/unlock_set_unlock_off_title"
             android:summary="@string/unlock_set_unlock_off_summary"
             android:persistent="false"/>
 
-        <PreferenceScreen
+    <PreferenceScreen
             android:key="unlock_set_none"
             android:title="@string/unlock_set_unlock_none_title"
             android:summary="@string/unlock_set_unlock_none_summary"
             android:persistent="false"/>
 
-        <PreferenceScreen
+    <PreferenceScreen
             android:key="unlock_set_biometric_weak"
             android:title="@string/unlock_set_unlock_biometric_weak_title"
             android:summary="@string/unlock_set_unlock_biometric_weak_summary"
             android:persistent="false"/>
 
-        <PreferenceScreen
+    <PreferenceScreen
             android:key="unlock_set_pattern"
             android:title="@string/unlock_set_unlock_pattern_title"
             android:summary="@string/unlock_set_unlock_pattern_summary"
             android:persistent="false"/>
 
-        <PreferenceScreen
+    <PreferenceScreen
             android:key="unlock_set_pin"
             android:title="@string/unlock_set_unlock_pin_title"
             android:summary="@string/unlock_set_unlock_pin_summary"
             android:persistent="false"/>
 
-        <PreferenceScreen
+    <PreferenceScreen
             android:key="unlock_set_password"
             android:title="@string/unlock_set_unlock_password_title"
             android:summary="@string/unlock_set_unlock_password_summary"
             android:persistent="false"/>
 
-    </PreferenceCategory>
-
 </PreferenceScreen>