PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 5457035 : Anti-spoofing : DO NOT MERGE

Browse Source 
Squashed commit of the following:

commit 060b9daf5fe3c45573a13a149bf98f4fa1e6a46f
Author: Danielle Millett <dmillett@google.com>
Date:   Wed May 30 15:50:03 2012 -0400

    Added head turn option for Face Unlock.

    In security settings there is an option for head turn and it shows the current
    status (on/off).  Clicking on this goes to another screen that describes the
    feature and allows the user to it on/off.
    Since the head turn option goes to a different screen instead of using a check box,
    this change also rips out the rest of the code for the old liveliness checkbox.

    Change-Id: I197af51084f3e751081fa159dadd6c2c80840d1e

Change-Id: I67c8acd49316b49771a0bb97b4a5fbd5a1c13262
This commit is contained in:
Uriel Rodriguez
2012-05-30 19:55:12 -04:00
parent a2d5540731
commit 5c489be89c
5 changed files with 202 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
res/layout/biometric_weak_liveliness.xml Normal file
View File

@@ -0,0 +1,46 @@
<?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>

10
res/values/strings.xml
View File

@@ -644,6 +644,16 @@
<!-- 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 -->
<string name="biometric_weak_liveliness_title">Require head turn</string>
<!-- Used to describe the on state of the face unlock liveliness feature -->
<string name="biometric_weak_liveliness_on_summary">On</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. -->
<string name="biometric_weak_liveliness_explained" product="tablet">When this feature is turned on, other people can\'t use a photo of you to fool Face Unlock. While unlocking your tablet, you\'ll be asked to turn your head. You can turn it slightly to the left or right.</string>
<!-- 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">When this feature is turned on, other people can\'t use a photo of you to fool Face Unlock. While unlocking your phone, you\'ll be asked to turn your head. You can turn it slightly to the left or right.</string>
<!-- Security settings screen, setting option name to change screen timeout -->
<string name="lock_after_timeout">Automatically lock</string>

5
res/xml/security_settings_biometric_weak.xml
View File

@@ -30,6 +30,11 @@
android:key="biometric_weak_improve_matching"
android:title="@string/biometric_weak_improve_matching_title"/>
<PreferenceScreen
android:key="biometric_weak_liveliness"
android:fragment="com.android.settings.BiometricWeakLiveliness"
android:title="@string/biometric_weak_liveliness_title"/>
<CheckBoxPreference
android:key="visiblepattern"
android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>