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

Merge "Changed header to specify backup lock"

Browse Source
This commit is contained in:
Danielle Millett
2011-09-27 06:14:01 -07:00
committed by Android (Google) Code Review
parent e12b4cd54d 940407eb6a
commit cc571cc4fe
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -769,7 +769,7 @@
<!-- Security Picker --><skip /> <!-- Security Picker --><skip />
<!-- Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] --> <!-- 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] --> <!-- 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> <string name="backup_lock_settings_picker_title">Choose backup lock</string>
@@ -801,7 +801,7 @@
<string name="unlock_set_unlock_none_summary">No security</string> <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] --> <!-- 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]--> <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
<string name="unlock_set_unlock_biometric_weak_summary">Low security, experimental</string> <string name="unlock_set_unlock_biometric_weak_summary">Low security, experimental</string>
@@ -828,7 +828,7 @@
<!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] --> <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
<string name="unlock_set_unlock_mode_none">Slide</string> <string name="unlock_set_unlock_mode_none">Slide</string>
<!-- Summary for "Configure lockscreen" when security biometric weak is enabled [CHAR LIMIT=45] --> <!-- 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] --> <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
<string name="unlock_set_unlock_mode_pattern">Secured with pattern</string> <string name="unlock_set_unlock_mode_pattern">Secured with pattern</string>
<!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] --> <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->

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

@@ -213,6 +213,7 @@ public class ChooseLockGeneric extends PreferenceActivity {
.getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false); .getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
final boolean weakBiometricAvailable = isBiometricSensorAvailable( final boolean weakBiometricAvailable = isBiometricSensorAvailable(
DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK); DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK);
// TODO: This code can be removed once the second header is gone
if (onlyShowFallback) { if (onlyShowFallback) {
picker.setTitle(R.string.backup_lock_settings_picker_title); picker.setTitle(R.string.backup_lock_settings_picker_title);
} else { } else {
@@ -271,6 +272,8 @@ public class ChooseLockGeneric extends PreferenceActivity {
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);
fallBackIntent.putExtra(CONFIRM_CREDENTIALS, false); 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); fallBackIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
Intent intent = new Intent().setClassName("com.android.facelock", Intent intent = new Intent().setClassName("com.android.facelock",