diff options
| author | Paul Crowley <paulcrowley@google.com> | 2014-11-04 22:51:36 +0000 |
|---|---|---|
| committer | Paul Crowley <paulcrowley@google.com> | 2014-11-05 00:43:33 +0000 |
| commit | 01fbd9fd3ca70f7181c2421cc5f080136384737e (patch) | |
| tree | fd868d6421bcffc38b34c224c7d3957f07c07b48 /src/com/android/settings/CryptKeeperSettings.java | |
| parent | 508a693c9a240a5f297704c8cc837a3cb5702d6c (diff) | |
| download | packages_apps_Settings-01fbd9fd3ca70f7181c2421cc5f080136384737e.zip packages_apps_Settings-01fbd9fd3ca70f7181c2421cc5f080136384737e.tar.gz packages_apps_Settings-01fbd9fd3ca70f7181c2421cc5f080136384737e.tar.bz2 | |
Don't show a pattern-specific prompt at encryption time.
Bug: 18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
Diffstat (limited to 'src/com/android/settings/CryptKeeperSettings.java')
| -rw-r--r-- | src/com/android/settings/CryptKeeperSettings.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java index c572738..d962446 100644 --- a/src/com/android/settings/CryptKeeperSettings.java +++ b/src/com/android/settings/CryptKeeperSettings.java @@ -16,8 +16,6 @@ package com.android.settings; -import com.android.internal.widget.LockPatternUtils; - import android.app.Activity; import android.app.AlertDialog; import android.app.Fragment; @@ -81,7 +79,7 @@ public class CryptKeeperSettings extends Fragment { * is no keyguard available, we prompt the user to set a password. */ private Button.OnClickListener mInitiateListener = new Button.OnClickListener() { - + @Override public void onClick(View v) { if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) { // TODO replace (or follow) this dialog with an explicit launch into password UI @@ -162,8 +160,7 @@ public class CryptKeeperSettings extends Fragment { return true; } - return helper.launchConfirmationActivity(request, - res.getText(R.string.master_clear_gesture_prompt), + return helper.launchConfirmationActivity(request, null, res.getText(R.string.crypt_keeper_confirm_encrypt), true); } |