Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81d7a806 authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

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
parent b96b35a6

res/values/strings.xml

+6 −1
Original line number Diff line number Diff line
@@ -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] -->

src/com/android/settings/CredentialStorage.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }