Merge "Removing head turn and putting blink back" into jb-dev

3 files changed, 6 insertions, 57 deletions

diff --git a/res/layout/biometric_weak_liveliness.xml b/res/layout/biometric_weak_liveliness.xml
deleted file mode 100644
index 916bd9a..0000000
--- a/res/layout/biometric_weak_liveliness.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
-    android:layout_width="match_parent" android:layout_height="wrap_content"
-    android:scrollbars="vertical" >
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView android:id="@+id/biometric_weak_liveliness_explained"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dip"
-                android:gravity="top"
-                android:text="@string/biometric_weak_liveliness_explained"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>
-
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ebe764c..7aa2b8a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -644,15 +644,10 @@
 
     <!-- Security settings screen when using face unlock, setting option name to start an activity that allows the user to improve accuracy by adding additional enrollment faces -->
     <string name="biometric_weak_improve_matching_title">Improve face matching</string>
-    <!-- On the security settings screen when using face unlock.  This goes to a screen that explains liveliness detection and allows for it to be turned on/off -->
+<!-- On the security settings screen when using face unlock.  This checkbox is used to toggle whether liveliness detection is required.  If it is checked the user must blink during unlock to prove it's not a photo  -->
     <string name="biometric_weak_liveliness_title">Liveness check</string>
-    <!-- Used to describe the on state of the face unlock liveliness feature -->
-    <string name="biometric_weak_liveliness_on_summary">On - head turn required to unlock</string>
-    <!-- Used to describe the off state of the face unlock liveliness feature -->
-    <string name="biometric_weak_liveliness_off_summary">Off</string>
-    <!-- Explanation of the Face Unlock liveliness feature. It's displayed on a screen with an on/off toggle switch. -->
-    <!-- Explanation of the Face Unlock liveliness feature. It's displayed on a screen with an on/off toggle switch. -->
-    <string name="biometric_weak_liveliness_explained" product="default">To improve security, you\'ll be asked to turn your head while unlocking.  When prompted, turn to the left or right.</string>
+    <!-- On the security settings screen when using face unlock.  The summary of the liveliness checkbox -->
+    <string name="biometric_weak_liveliness_summary">Require eye blink while unlocking</string>
 
     <!-- Security settings screen, setting option name to change screen timeout -->
     <string name="lock_after_timeout">Automatically lock</string>
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 66cca28..6593f07 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -30,10 +30,10 @@
             android:key="biometric_weak_improve_matching"
             android:title="@string/biometric_weak_improve_matching_title"/>
 
-        <PreferenceScreen
+        <CheckBoxPreference
            android:key="biometric_weak_liveliness"
-           android:fragment="com.android.settings.BiometricWeakLiveliness"
-           android:title="@string/biometric_weak_liveliness_title"/>
+           android:title="@string/biometric_weak_liveliness_title"
+           android:summary="@string/biometric_weak_liveliness_summary"/>
 
         <CheckBoxPreference
             android:key="visiblepattern"