summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SecuritySettings.java
diff options
context:
space:
mode:
authorDanielle Millett <dmillett@google.com>2011-10-19 13:58:30 -0400
committerDanielle Millett <dmillett@google.com>2011-10-19 13:58:30 -0400
commit8123493ef905a210bd00b0c623459f4c86505298 (patch)
treea85159d31a985871226967de3eaaf9a8cb19e131 /src/com/android/settings/SecuritySettings.java
parent0bcd8a95a96566d9e2c97c3305ee0dccf758ca7a (diff)
downloadpackages_apps_settings-8123493ef905a210bd00b0c623459f4c86505298.zip
packages_apps_settings-8123493ef905a210bd00b0c623459f4c86505298.tar.gz
packages_apps_settings-8123493ef905a210bd00b0c623459f4c86505298.tar.bz2
Fix 5428748: Added more options for biometric weak
Adding make pattern visible (for pattern backup only) and vibrate on touch as options for when biometric weak is enabled. Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
-rw-r--r--src/com/android/settings/SecuritySettings.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 6023389..5df5805 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -123,7 +123,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
resid = R.xml.security_settings_password;
break;
}
- // TODO: enable facepass options
}
addPreferencesFromResource(resid);
@@ -153,6 +152,17 @@ public class SecuritySettings extends SettingsPreferenceFragment
// visible pattern
mVisiblePattern = (CheckBoxPreference) root.findPreference(KEY_VISIBLE_PATTERN);
+ // don't display visible pattern if biometric and backup is not pattern
+ if (resid == R.xml.security_settings_biometric_weak &&
+ mLockPatternUtils.getKeyguardStoredPasswordQuality() !=
+ DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
+ PreferenceGroup securityCategory = (PreferenceGroup)
+ root.findPreference(KEY_SECURITY_CATEGORY);
+ if (securityCategory != null && mVisiblePattern != null) {
+ securityCategory.removePreference(root.findPreference(KEY_VISIBLE_PATTERN));
+ }
+ }
+
// tactile feedback. Should be common to all unlock preference screens.
mTactileFeedback = (CheckBoxPreference) root.findPreference(KEY_TACTILE_FEEDBACK_ENABLED);
if (!((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {