Don't show a pattern-specific prompt at encryption time.
Bug: 18054895
Change-Id: I8a029142085b9e7f59efc8e313b6438734d5a1bb
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7afec0b..cba7cc4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2466,8 +2466,6 @@
<string name="master_clear_final_desc">Erase all your personal information and downloaded apps? You can\'t reverse this action!</string>
<!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
<string name="master_clear_final_button_text">Erase everything</string>
- <!-- Message to draw an unlock pattern before clearing the device -->
- <string name="master_clear_gesture_prompt">Draw your unlock pattern</string>
<!-- Explanation of drawing unlock pattern to reset phone -->
<string name="master_clear_gesture_explanation">You need to draw your unlock pattern to confirm a factory data reset.</string>
<!-- Master clear failed message -->
@@ -2504,8 +2502,6 @@
<string name="media_format_final_desc" product="default">Erase the SD card, deleting all files stored there? You can\'t reverse this action!</string>
<!-- SD card & phone storage settings screen, button on screen after user selects Format media button -->
<string name="media_format_final_button_text">Erase everything</string>
- <!-- Message to draw an unlock pattern before clearing the device -->
- <string name="media_format_gesture_prompt">Draw your unlock pattern</string>
<!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
<string name="media_format_gesture_explanation" product="nosdcard">You need to draw your unlock pattern to confirm that you want to erase the USB storage.</string>
<!-- Explanation of drawing unlock pattern to format card [CHAR LIMIT=NONE] -->
@@ -4326,8 +4322,6 @@
<!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
<string name="credentials_settings_not_available">Credentials are not available for this user</string>
- <!-- Message to draw an unlock pattern when installing credentials -->
- <string name="credentials_install_gesture_prompt">Draw your unlock pattern</string>
<!-- Explanation of drawing unlock pattern to install credentials -->
<string name="credentials_install_gesture_explanation">You need to draw your unlock pattern to confirm credential installation.</string>
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 57b5384..2e917f5 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -376,8 +376,7 @@
private boolean confirmKeyGuard() {
Resources res = getResources();
boolean launched = new ChooseLockSettingsHelper(this)
- .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST,
- res.getText(R.string.credentials_install_gesture_prompt),
+ .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST, null,
res.getText(R.string.credentials_install_gesture_explanation),
true);
return launched;
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 @@
* 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 @@
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);
}
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index a2ca554..1c9fe5c 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -72,8 +72,7 @@
private boolean runKeyguardConfirmation(int request) {
Resources res = getActivity().getResources();
return new ChooseLockSettingsHelper(getActivity(), this)
- .launchConfirmationActivity(request,
- res.getText(R.string.master_clear_gesture_prompt),
+ .launchConfirmationActivity(request, null,
res.getText(R.string.master_clear_gesture_explanation));
}
diff --git a/src/com/android/settings/MediaFormat.java b/src/com/android/settings/MediaFormat.java
index dc495ec..20dac8e 100644
--- a/src/com/android/settings/MediaFormat.java
+++ b/src/com/android/settings/MediaFormat.java
@@ -73,8 +73,7 @@
*/
private boolean runKeyguardConfirmation(int request) {
return new ChooseLockSettingsHelper(this)
- .launchConfirmationActivity(request,
- getText(R.string.media_format_gesture_prompt),
+ .launchConfirmationActivity(request, null,
getText(R.string.media_format_gesture_explanation));
}