summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ChooseLockGeneric.java
diff options
context:
space:
mode:
authorDanielle Millett <dmillett@google.com>2011-09-19 19:16:29 -0400
committerDanielle Millett <dmillett@google.com>2011-09-26 18:06:37 -0400
commit940407eb6aac05a513d2f7d0626df9519be3a83c (patch)
tree3962a246bee37520daf8926a94971bbe666cea7d /src/com/android/settings/ChooseLockGeneric.java
parent9fe945b854f92314ad387705ad20a129e46c317a (diff)
downloadpackages_apps_settings-940407eb6aac05a513d2f7d0626df9519be3a83c.zip
packages_apps_settings-940407eb6aac05a513d2f7d0626df9519be3a83c.tar.gz
packages_apps_settings-940407eb6aac05a513d2f7d0626df9519be3a83c.tar.bz2
Changed header to specify backup lock
-Changed main header to show backup lock text -Reworded normal header -Changed instances of FacePass to FaceLock Change-Id: I66cbd3ada87df30b6b7ceb1a784d365ba60a8f41
Diffstat (limited to 'src/com/android/settings/ChooseLockGeneric.java')
-rw-r--r--src/com/android/settings/ChooseLockGeneric.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 949242e..ac66a97 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",