Don't show a pattern-specific prompt at encryption time.

Bug: 18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
This commit is contained in:
Paul Crowley
2014-11-04 22:51:36 +00:00
parent 508a693c9a
commit 01fbd9fd3c
5 changed files with 5 additions and 17 deletions

View File

@@ -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);
}