Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8123493e authored by Danielle Millett's avatar Danielle Millett
Browse files

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
parent 0bcd8a95

res/xml/security_settings_biometric_weak.xml

+8 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ 
            android:summary="@string/unlock_set_unlock_mode_biometric_weak"

            android:persistent="false"/>



        <CheckBoxPreference

            android:key="visiblepattern"

            android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>



        <ListPreference

            android:key="lock_after_timeout"

            android:title="@string/lock_after_timeout"
@@ -34,6 +38,10 @@ 
            android:entryValues="@array/lock_after_timeout_values"

            android:persistent="false"/>



        <CheckBoxPreference

            android:key="unlock_tactile_feedback"

            android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>



        <PreferenceScreen

            android:fragment="com.android.settings.OwnerInfoSettings"

            android:key="owner_info_settings"

src/com/android/settings/SecuritySettings.java

+11 −1
Original line number Diff line number Diff line
@@ -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()) {