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

Reorganized the biometric weak check functions

Browse Source 
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
This commit is contained in:
Danielle Millett
2011-09-30 13:49:14 -04:00
parent 31dac17c4b
commit 0fb158a685
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -22,7 +22,6 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemProperties;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
@@ -231,8 +230,8 @@ public class ChooseLockGeneric extends PreferenceActivity {
final PreferenceScreen entries = getPreferenceScreen(); final PreferenceScreen entries = getPreferenceScreen();
final boolean onlyShowFallback = getActivity().getIntent() final boolean onlyShowFallback = getActivity().getIntent()
.getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false); .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
final boolean weakBiometricAvailable = isBiometricSensorAvailable( final boolean weakBiometricAvailable =
DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK); mChooseLockSettingsHelper.utils().isBiometricWeakInstalled();
for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) { for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
Preference pref = entries.getPreference(i); Preference pref = entries.getPreference(i);
if (pref instanceof PreferenceScreen) { 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); 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) { private Intent getBiometricSensorIntent(int quality) {
Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class); Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class);
fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true); fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);

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

@@ -106,7 +106,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
} else { } else {
resid = R.xml.security_settings_chooser; resid = R.xml.security_settings_chooser;
} }
} else if (mLockPatternUtils.usingBiometricWeak()) { } else if (mLockPatternUtils.usingBiometricWeak() &&
mLockPatternUtils.isBiometricWeakInstalled()) {
resid = R.xml.security_settings_biometric_weak; resid = R.xml.security_settings_biometric_weak;
} else { } else {
switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) { switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {