summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ChooseLockPassword.java
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-04-06 17:47:18 -0700
committerJorim Jaggi <jjaggi@google.com>2015-04-13 14:59:26 -0700
commit8a09b619aeb233e2aab1919301f162d8acf1f0f0 (patch)
treeaeec574a47f0f71ab9177b2e4ef7f912e87f61b6 /src/com/android/settings/ChooseLockPassword.java
parentb5aa73f46f812ba03518a6d1ac218e3af5975236 (diff)
downloadpackages_apps_Settings-8a09b619aeb233e2aab1919301f162d8acf1f0f0.zip
packages_apps_Settings-8a09b619aeb233e2aab1919301f162d8acf1f0f0.tar.gz
packages_apps_Settings-8a09b619aeb233e2aab1919301f162d8acf1f0f0.tar.bz2
Update confirm device credentials to spec, add fingerprint
- New strings in the screen. - New layout/style. - Clean up internal API's around it. - Add fingerprint support if launched from externally - Separate theme if launched from externally - If launched from above Keyguard, use SHOW_WHEN_LOCKED flag Change-Id: Icdf9bf9e0506841f24e8aab5f0f1d1f4b688951f
Diffstat (limited to 'src/com/android/settings/ChooseLockPassword.java')
-rw-r--r--src/com/android/settings/ChooseLockPassword.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 6d7b71d..8838286 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -243,7 +243,7 @@ public class ChooseLockPassword extends SettingsActivity {
updateStage(Stage.Introduction);
if (confirmCredentials) {
mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
- null, null);
+ getString(R.string.unlock_set_unlock_launch_picker_title));
}
} else {
mFirstPin = savedInstanceState.getString(KEY_FIRST_PIN);