summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorDanielle Millett <dmillett@google.com>2012-06-08 14:18:05 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-08 14:18:05 -0700
commitacd377718479fe0d4f093c2f2f5326e59e31ff63 (patch)
treeff9be1a205becffa7d55c14db0d240cd87f7cb34 /res/xml
parentb3a049f5392da8500befaf2595f5170cf04cc432 (diff)
parent4a3e40d68e8b01871121655456d7a1dfa3312f71 (diff)
downloadpackages_apps_Settings-acd377718479fe0d4f093c2f2f5326e59e31ff63.zip
packages_apps_Settings-acd377718479fe0d4f093c2f2f5326e59e31ff63.tar.gz
packages_apps_Settings-acd377718479fe0d4f093c2f2f5326e59e31ff63.tar.bz2
Merge "Removing head turn and putting blink back" into jb-dev
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/security_settings_biometric_weak.xml6
1 files changed, 3 insertions, 3 deletions
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"