Merge "Adding info explaining facelock's backup lock"

res/values/strings.xml

@@ -756,6 +756,9 @@
     <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
     <string name="lock_settings_picker_title">Screen lock</string>
 
+    <!--  Title for security picker when choosing a facelock's backup unlock method: Pattern/PIN [CHAR LIMIT=22] -->
+    <string name="backup_lock_settings_picker_title">Choose backup lock</string>
+
     <!--  Main Security lock settings --><skip />
     <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_launch_picker_title">Screen lock</string>
@@ -769,6 +772,9 @@
     <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
     <string name="unlock_set_unlock_launch_picker_enable_summary">Choose a method to lock the screen</string>
 
+    <!-- Info explaining the backup lock which is used for facelock -->
+    <string name="unlock_backup_info_summary">When conditions for FaceLock aren\'t ideal, how do you want to unlock?</string>
+
     <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_off_title">None</string>
     <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->

res/xml/security_settings_picker.xml

@@ -20,6 +20,13 @@
         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
             android:key="unlock_set_off"
             android:title="@string/unlock_set_unlock_off_title"