From 229d06a83943a2c924d9c06e0f31d71e5e8801b9 Mon Sep 17 00:00:00 2001
From: Brian Colonna <bcolonna@google.com>
Date: Fri, 1 May 2015 12:18:30 -0400
Subject: [PATCH] Removed some dead Face Unlock code.

I checked to see if any dead Face Unlock code remains in settings.  Most of it
has been removed, but I did find some strings and an xml file that can be
removed.

Bug: 16139545
Change-Id: I16d7b3a258c72d6788348d1fbe35a7f6bc12ee8e
---
 res/layout/weak_biometric_fallback_header.xml | 23 -------------------
 res/values/strings.xml                        |  6 -----
 2 files changed, 29 deletions(-)
 delete mode 100644 res/layout/weak_biometric_fallback_header.xml

diff --git a/res/layout/weak_biometric_fallback_header.xml b/res/layout/weak_biometric_fallback_header.xml
deleted file mode 100644
index 5f9c2a24b80..00000000000
--- a/res/layout/weak_biometric_fallback_header.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:text="@string/unlock_backup_info_summary"
-/>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 52beac25a2f..a4066c1ece8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -938,9 +938,6 @@
     <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
     <string name="lock_settings_picker_title">Choose 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>
@@ -954,9 +951,6 @@
     <!--  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 Face Unlock can\u2019t see you, 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] -->