From 81d7a806a6403cd98a0c6dd0ba7288d728382144 Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Tue, 1 May 2012 11:17:02 -0700
Subject: [PATCH] Do not reuse master_clear_gesture_* strings for credential
 installation confirmation

Bug: http://code.google.com/p/android/issues/detail?id=29367
Change-Id: I3b651bc84f22b48d651802115600ab4e256bb3a6
---
 res/values/strings.xml                          | 7 ++++++-
 src/com/android/settings/CredentialStorage.java | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7c2865341e5..8ee96e414e9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2036,7 +2036,7 @@
     <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 unlockp attern to reset phone -->
+    <!-- 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 -->
     <string name="master_clear_failed">No reset was performed because the System Clear service isn\'t available.</string>
@@ -3236,6 +3236,11 @@
     <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
     <string name="trusted_credentials_summary">Display trusted CA certificates</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>
+
     <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
     <string name="credentials_unlock"></string>
     <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index b9a43a1a0f7..c12d06c1540 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -338,8 +338,8 @@ public final class CredentialStorage extends Activity {
         Resources res = getResources();
         boolean launched = new ChooseLockSettingsHelper(this)
                 .launchConfirmationActivity(CONFIRM_KEY_GUARD_REQUEST,
-                                            res.getText(R.string.master_clear_gesture_prompt),
-                                            res.getText(R.string.master_clear_gesture_explanation));
+                                            res.getText(R.string.credentials_install_gesture_prompt),
+                                            res.getText(R.string.credentials_install_gesture_explanation));
         return launched;
     }