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

Fix 5428748: Added more options for biometric weak

Browse Source 
Adding make pattern visible (for pattern backup only) and vibrate
on touch as options for when biometric weak is enabled.

Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88
This commit is contained in:
Danielle Millett
2011-10-19 13:58:30 -04:00
parent 0bcd8a95a9
commit 8123493ef9
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/security_settings_biometric_weak.xml
View File

@@ -26,6 +26,10 @@
android:summary="@string/unlock_set_unlock_mode_biometric_weak" android:summary="@string/unlock_set_unlock_mode_biometric_weak"
android:persistent="false"/> android:persistent="false"/>
<CheckBoxPreference
android:key="visiblepattern"
android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
<ListPreference <ListPreference
android:key="lock_after_timeout" android:key="lock_after_timeout"
android:title="@string/lock_after_timeout" android:title="@string/lock_after_timeout"
@@ -34,6 +38,10 @@
android:entryValues="@array/lock_after_timeout_values" android:entryValues="@array/lock_after_timeout_values"
android:persistent="false"/> android:persistent="false"/>
<CheckBoxPreference
android:key="unlock_tactile_feedback"
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
<PreferenceScreen <PreferenceScreen
android:fragment="com.android.settings.OwnerInfoSettings" android:fragment="com.android.settings.OwnerInfoSettings"
android:key="owner_info_settings" android:key="owner_info_settings"

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

@@ -123,7 +123,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
resid = R.xml.security_settings_password; resid = R.xml.security_settings_password;
break; break;
} }
// TODO: enable facepass options
} }
addPreferencesFromResource(resid); addPreferencesFromResource(resid);
@@ -153,6 +152,17 @@ public class SecuritySettings extends SettingsPreferenceFragment
// visible pattern // visible pattern
mVisiblePattern = (CheckBoxPreference) root.findPreference(KEY_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. // tactile feedback. Should be common to all unlock preference screens.
mTactileFeedback = (CheckBoxPreference) root.findPreference(KEY_TACTILE_FEEDBACK_ENABLED); mTactileFeedback = (CheckBoxPreference) root.findPreference(KEY_TACTILE_FEEDBACK_ENABLED);
if (!((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) { if (!((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {