Merge "Don't show a pattern-specific prompt at encryption time." into lmp-mr1-dev

src/com/android/settings/CredentialStorage.java

@@ -376,8 +376,7 @@ public final class CredentialStorage extends Activity {
     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;

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

src/com/android/settings/MasterClear.java

@@ -72,8 +72,7 @@ public class MasterClear extends Fragment {
     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));
     }
 

src/com/android/settings/MediaFormat.java

@@ -73,8 +73,7 @@ public class MediaFormat extends Activity {
      */
     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));
     }