diff options
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 37203904b..5475418b3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -764,7 +764,7 @@ <!-- Security Picker --><skip /> <!-- Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] --> - <string name="lock_settings_picker_title">Screen lock</string> + <string name="lock_settings_picker_title">Select screen lock</string> <!-- Title for security picker when choosing a facelock's backup unlock method: Pattern/PIN [CHAR LIMIT=22] --> <string name="backup_lock_settings_picker_title">Choose backup lock</string> @@ -796,7 +796,7 @@ <string name="unlock_set_unlock_none_summary">No security</string> <!-- Title for preference that guides the user through a weak biometric lock [CHAR LIMIT=22] --> - <string name="unlock_set_unlock_biometric_weak_title">FacePass</string> + <string name="unlock_set_unlock_biometric_weak_title">FaceLock</string> <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]--> <string name="unlock_set_unlock_biometric_weak_summary">Low security, experimental</string> @@ -823,7 +823,7 @@ <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] --> <string name="unlock_set_unlock_mode_none">Slide</string> <!-- Summary for "Configure lockscreen" when security biometric weak is enabled [CHAR LIMIT=45] --> - <string name="unlock_set_unlock_mode_biometric_weak">FacePass</string> + <string name="unlock_set_unlock_mode_biometric_weak">FaceLock</string> <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] --> <string name="unlock_set_unlock_mode_pattern">Secured with pattern</string> <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] --> diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 949242e02..ac66a972b 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -213,6 +213,7 @@ public class ChooseLockGeneric extends PreferenceActivity { .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false); final boolean weakBiometricAvailable = isBiometricSensorAvailable( DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK); + // TODO: This code can be removed once the second header is gone if (onlyShowFallback) { picker.setTitle(R.string.backup_lock_settings_picker_title); } else { @@ -271,6 +272,8 @@ public class ChooseLockGeneric extends PreferenceActivity { Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class); fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true); fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false); + fallBackIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE, + R.string.backup_lock_settings_picker_title); fallBackIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); Intent intent = new Intent().setClassName("com.android.facelock", |