diff --git a/res/values/strings.xml b/res/values/strings.xml index 863d66c07b2..68f14d919c3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -756,6 +756,9 @@ Screen lock + + Choose backup lock + Screen lock @@ -769,6 +772,9 @@ Choose a method to lock the screen + + When conditions for FaceLock aren\'t ideal, how do you want to unlock? + None diff --git a/res/xml/security_settings_picker.xml b/res/xml/security_settings_picker.xml index c2202149380..2d0760ca55f 100644 --- a/res/xml/security_settings_picker.xml +++ b/res/xml/security_settings_picker.xml @@ -20,6 +20,13 @@ android:key="security_picker_category" android:title="@string/lock_settings_picker_title"> + + + = 0; --i) { Preference pref = cat.getPreference(i); if (pref instanceof PreferenceScreen) { final String key = ((PreferenceScreen) pref).getKey(); boolean enabled = true; boolean visible = true; - if (KEY_UNLOCK_SET_OFF.equals(key)) { + if (KEY_UNLOCK_BACKUP_INFO.equals(key)) { + enabled = true; + visible = onlyShowFallback; + } else if (KEY_UNLOCK_SET_OFF.equals(key)) { enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; } else if (KEY_UNLOCK_SET_NONE.equals(key)) { enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; @@ -250,7 +259,8 @@ public class ChooseLockGeneric extends PreferenceActivity { * @return true if allowed */ private boolean allowedForFallback(String key) { - return KEY_UNLOCK_SET_PATTERN.equals(key) || KEY_UNLOCK_SET_PIN.equals(key); + return KEY_UNLOCK_BACKUP_INFO.equals(key) || + KEY_UNLOCK_SET_PATTERN.equals(key) || KEY_UNLOCK_SET_PIN.equals(key); } private boolean isBiometricSensorAvailable(int quality) {