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

am 8123493e: Fix 5428748: Added more options for biometric weak

Browse Source 
* commit '8123493ef905a210bd00b0c623459f4c86505298':
  Fix 5428748: Added more options for biometric weak
This commit is contained in:
Danielle Millett
2011-10-19 15:14:41 -07:00
committed by Android Git Automerger
parent e790a067cb 8123493ef9
commit d4227b0386
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/SecuritySettings.java
View File

@@ -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()) {