diff options
author | Uriel Rodriguez <urodriguez@google.com> | 2012-05-30 19:55:12 -0400 |
---|---|---|
committer | Uriel Rodriguez <urodriguez@google.com> | 2012-05-30 19:55:12 -0400 |
commit | 5c489be89cad070cefc04e9b59f84a0b9d1a26ec (patch) | |
tree | d167ee3c3cede932359731fc09ec2347146154b6 /res/layout | |
parent | a2d55407317b50f86069f9e9feb6a0478ee3b1f9 (diff) | |
download | packages_apps_settings-5c489be89cad070cefc04e9b59f84a0b9d1a26ec.zip packages_apps_settings-5c489be89cad070cefc04e9b59f84a0b9d1a26ec.tar.gz packages_apps_settings-5c489be89cad070cefc04e9b59f84a0b9d1a26ec.tar.bz2 |
BUG 5457035 : Anti-spoofing : DO NOT MERGE
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
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/biometric_weak_liveliness.xml | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/res/layout/biometric_weak_liveliness.xml b/res/layout/biometric_weak_liveliness.xml new file mode 100644 index 0000000..916bd9a --- /dev/null +++ b/res/layout/biometric_weak_liveliness.xml @@ -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> + |