diff options
| author | Danielle Millett <dmillett@google.com> | 2012-05-14 16:24:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-14 16:24:42 -0700 |
| commit | 1cbd519ebc8f9c93563a796fa404492678388b31 (patch) | |
| tree | 902479d28f0821574e02a716a56eef8dedf0b488 | |
| parent | 7978ef631ab861130ec0fa2713692bccf5edbbaf (diff) | |
| parent | 70cd7f223d36c820c529bf619b07d6d8ce74163d (diff) | |
| download | packages_apps_Settings-1cbd519ebc8f9c93563a796fa404492678388b31.zip packages_apps_Settings-1cbd519ebc8f9c93563a796fa404492678388b31.tar.gz packages_apps_Settings-1cbd519ebc8f9c93563a796fa404492678388b31.tar.bz2 | |
Merge "Removing the blink checkbox and strings" into jb-dev
| -rw-r--r-- | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | res/xml/security_settings_biometric_weak.xml | 5 |
2 files changed, 0 insertions, 12 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 948a69e..fe737bd 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -640,13 +640,6 @@ <!-- 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 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">Require eye blink</string> - <!-- On the security settings screen when using face unlock. The summary of the liveliness checkbox --> - <string name="biometric_weak_liveliness_summary" product="tablet">Prevent others from using a photo of you to unlock your tablet</string> - <!-- On the security settings screen when using face unlock. The summary of the liveliness checkbox --> - <string name="biometric_weak_liveliness_summary" product="default">Prevent others from using a photo of you to unlock your phone</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 4a41431..080fbc9 100644 --- a/res/xml/security_settings_biometric_weak.xml +++ b/res/xml/security_settings_biometric_weak.xml @@ -31,11 +31,6 @@ android:title="@string/biometric_weak_improve_matching_title"/> <CheckBoxPreference - android:key="biometric_weak_liveliness" - android:title="@string/biometric_weak_liveliness_title" - android:summary="@string/biometric_weak_liveliness_summary"/> - - <CheckBoxPreference android:key="visiblepattern" android:title="@string/lockpattern_settings_enable_visible_pattern_title"/> |