diff options
| author | Danielle Millett <dmillett@google.com> | 2011-09-30 13:49:14 -0400 |
|---|---|---|
| committer | Danielle Millett <dmillett@google.com> | 2011-09-30 17:47:45 -0400 |
| commit | 0fb158a685d753682afdcffb0b783be8e38e0f2b (patch) | |
| tree | d5eb49bec8bd080744d6555391e10169d01e3482 /src/com/android/settings/ChooseLockGeneric.java | |
| parent | 31dac17c4b0b49b4968b42b2af6f0799a0508a2f (diff) | |
| download | packages_apps_settings-0fb158a685d753682afdcffb0b783be8e38e0f2b.zip packages_apps_settings-0fb158a685d753682afdcffb0b783be8e38e0f2b.tar.gz packages_apps_settings-0fb158a685d753682afdcffb0b783be8e38e0f2b.tar.bz2 | |
Reorganized the biometric weak check functions
Moved isBiometricSensorAvailable functionality into
isBiometricWeakInstalled (formerly called isBiometricEnabled). Settings
now only shows biometric weak if it's installed, if it's not installed
and the lock type is currently set to biometric weak, the backup lock
is shown as being set instead.
Change-Id: Icfe326a6598df33ee60d5fdc024273d94f115983
Diffstat (limited to 'src/com/android/settings/ChooseLockGeneric.java')
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 9301a86..d589aa3 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -22,7 +22,6 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.os.SystemProperties; import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.PreferenceScreen; @@ -231,8 +230,8 @@ public class ChooseLockGeneric extends PreferenceActivity { final PreferenceScreen entries = getPreferenceScreen(); final boolean onlyShowFallback = getActivity().getIntent() .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false); - final boolean weakBiometricAvailable = isBiometricSensorAvailable( - DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK); + final boolean weakBiometricAvailable = + mChooseLockSettingsHelper.utils().isBiometricWeakInstalled(); for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) { Preference pref = entries.getPreference(i); if (pref instanceof PreferenceScreen) { @@ -275,10 +274,6 @@ public class ChooseLockGeneric extends PreferenceActivity { KEY_UNLOCK_SET_PATTERN.equals(key) || KEY_UNLOCK_SET_PIN.equals(key); } - private boolean isBiometricSensorAvailable(int quality) { - return SystemProperties.getBoolean("ro.lockscreen.facelock_enabled", false); - } - private Intent getBiometricSensorIntent(int quality) { Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class); fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true); |